From: Anatol Belski <ab@php.net>
Date: Wed, 20 Nov 2013 09:12:06 +0000 (+0100)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.0alpha1~187^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c694d1df7babdea108c96dde03db81b1e3e26af6;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  permanently deactivate that place, not on runtime only
---

c694d1df7babdea108c96dde03db81b1e3e26af6