fix git color config
Merge branch 'ubuntu1204-php55'
use apache and php from ppa:ondrej/php5

(aka: php5.3 was EOL'd in 2011, leave it alone)