Merge remote-tracking branch 'lelutin/feature/vagrant_no_virtualbox'
authorMicah Anderson <micah@riseup.net>
Tue, 28 Jan 2014 21:23:41 +0000 (16:23 -0500)
committerMicah Anderson <micah@riseup.net>
Tue, 28 Jan 2014 21:23:41 +0000 (16:23 -0500)
1  2 
docs/platform/development.md

Simple merge