Update for PHP5.4 PPA
Merge branch 'master' of github.com:mgdm/precise-nginx

Conflicts:
	.vagrant