0..

Signed-off-by: flash-square <david.guillemin@gmail.com>
remove old yum library

Signed-off-by: flash-square <david.guillemin@gmail.com>
misc

Signed-off-by: flash-square <david.guillemin@gmail.com>
Merge branch 'master' of github.com:flash-square/DW-Vagrant

Signed-off-by: flash-square <david.guillemin@gmail.com>

Conflicts:
	.gitmodules
	php_dev_box/puppets/manifests/init.pp
	php_dev_box/puppets/modules/iptables
	php_dev_box/puppets/modules/ruby
	php_dev_box/xdebug.log
clean master

Signed-off-by: flash-square <david.guillemin@gmail.com>
Merge branch 'tested' of github.com:flash-square/DW-Vagrant