Bug 928669 - Async errors in development mode
Adding ability to add and remove domain wide environment variables from admin script
Update OpenShift web site URL on the Rack template.
scale-down should ignore haproxy gear
Fixing frontend_proxy_test
Add connection hooks.
Fixing environ tests
Added application_state tests
Better rescue for Errno
Adding Apache 2.4 and PHP 5.4 support to PHP v2 cartridge
Fix Path to erb executable
Merge pull request #1843 from smarterclayton/bug_928669_load_error_in_async

Merged by openshift-bot
Merge pull request #1847 from BanzaiMan/dev/hasari/bz928675

Bug 928675 Update OpenShift web site URL on the Rack template.
Merge pull request #1848 from rajatchopra/master

scale-down should ignore haproxy gear
Merge pull request #1851 from mrunalp/dev/pythonv2

Merged by openshift-bot
Merge pull request #1844 from kraman/admin_env_add

Merged by openshift-bot
Merge pull request #1850 from fotioslindiakos/test_unit_fix

Merged by openshift-bot
Merge pull request #1837 from kraman/php_v2

Merged by openshift-bot
Merge remote-tracking branch 'upstream/master'