update
Merge branch 'master' of https://github.com/cloud66-tests/rails3.2-ruby1.9.2-psql