Merge branch 'master' of github.com:leapcode/leap-vagrant
authorkwadronaut <kwadronaut@leap.se>
Tue, 27 May 2014 10:35:45 +0000 (12:35 +0200)
committerkwadronaut <kwadronaut@leap.se>
Tue, 27 May 2014 10:35:45 +0000 (12:35 +0200)
Conflicts:
definitions/wheezy/cleanup-virtualbox.sh
definitions/wheezy/definition.rb

1  2 
definitions/wheezy/definition.rb
definitions/wheezy/preseed.cfg
definitions/wheezy/virtualbox.sh

Simple merge
Simple merge
Simple merge