commit 803cdcac96f93a66a21f9240505fd86825efc426 Merge: 6cd12b3 88f6c9e Author: Mike Perry mikeperry-git@fscked.org Date: Mon Jul 15 15:43:05 2013 -0700

Merge remote-tracking branch 'arlolra/vagrant'

.gitignore | 1 + gitian/README.build | 2 +- vagrant/Makefile | 50 ++++++++++++++++++++++++ vagrant/README.md | 12 ++++++ vagrant/Vagrantfile | 108 +++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 172 insertions(+), 1 deletion(-)