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)
commitdd8613573ff5b0722bb2fbd31f2a62627f54c2e9
treed24ddddc1433e3323f186f13c6032e966d128627
parenteff8d0e0ca256459a7b1f02113b1456bdc5bdd7f
parenta056852708ff1d3bcc84ae207c9c3fbbd97e1ba0
Merge branch 'master' of github.com:leapcode/leap-vagrant

Conflicts:
definitions/wheezy/cleanup-virtualbox.sh
definitions/wheezy/definition.rb
definitions/wheezy/definition.rb
definitions/wheezy/preseed.cfg
definitions/wheezy/virtualbox.sh