Merge branch 'hotfix/box_url' into develop
Merge branch 'update-readme' into develop
Indent Vagrantfile correctly using Tabs
Merge branch 'refs/heads/hotfix/box_ip' into feature/hhvm
add HHVM
Merge branch 'master' into feature/hhvm
Merge branch 'master' into develop
Run hhvm as 'vagrant'
Merge branch 'refs/heads/master' into feature/hhvm
Merge branch 'refs/heads/master' into feature/hhvm
run hhvm as www-data
Merge branch 'master' into develop
Revert "Enable NFS mounts in vagrantfile"

This reverts commit a36bb00c70bf8d368657d8ff47bc79049086d410.

Conflicts:
	Vagrantfile

This Commit was not working for me (puppet kept asking for a password). So I reverted this.
Merge branch 'refs/heads/develop' into feature/hhvm

Conflicts:
	Vagrantfile
fix http 502 (bad gateway) after running 'vagrant provision' twice

I've seen a couple of those and managed it to track down to
pecl install xhprof (as it seems). php5-fpm does get an
SIG SEGV after installing this for the second time.
notify php5-fpm after installation of xhprof

this should make commit 2b1b1af8ae7a821a6696e19ea92fcc6498132487 more or less useless.
Merge branch 'develop' of github.com:hexa2k9/VagrantTYPO3 into develop
Cleanup
Install a better Editor ;)
more Cleanup