Fixed: add-apt-repository - unknown -y option (Ubuntu Lucid Lynx)
Removed packages file for Ubuntu Oneiric Ocelot ( EOL 20130509)
Small fixes
Removed php5-fpm section in packages file (Ubuntu Lucid)
Merge branch 'upstream-master'
Merge branch 'master' into fixes-20130324