Merge branch 'master' of https://github.com/davidjoy/adbox
Merge commit 'eadd5ccc3e238e977908d3d844738ad1ce09701e'
Merge branch 'master' of https://github.com/davidjoy/adbox
Merge branch 'master' of github.com:davidjoy/adbox
Run an apt-get upgrade during provisioning to update a few base packages
Pin PHP to 5.3.2-1unbuntu4.26 to prevent it from upgrading
Merge pull request #5 from tdukart/apt-get-upgrade

Run apt-get upgrade on build
Merge branch 'master' of https://github.com/chainsawsalad/adbox into chainsawsalad-master

Conflicts:
	modules/php/manifests/init.pp
Merge branch 'master' of https://github.com/chainsawsalad/adbox

Conflicts:
	modules/php/manifests/init.pp
Merge branch 'chainsawsalad-master'
Removing duplicate php5 declaration.

Accidentally checked in the dupe when merging Todd and Jeff's pull requests.