Lucas Carlson 9082fbc5cb Squashed merge of the final phpfog pull request ... Conflicts: AUTHORS cloud_controller/app/models/app.rb cloud_controller/spec/staging/php_spec.rb cloud_controller/staging/apache_common/resources/generate_apache_conf cloud_controller/staging/manifests/php.yml cloud_controller/staging/php/plugin.rb Change-Id: I638c125b777dca0139258295d2fbb37c16f30e21		2011-08-24 20:18:05 -07:00
..
erlang-otp.md	Add erlang support using otp_rebar.	2011-05-03 00:11:24 -07:00
php.md	Squashed merge of the final phpfog pull request	2011-08-24 20:18:05 -07:00
python.md	Document use of VCAP_SERVICES in django's settings.py	2011-08-12 14:52:38 -07:00