Merge branch 'PHP-5.4' into PHP-5.5
authorAnatoliy Belsky <ab@php.net>
Fri, 23 Nov 2012 13:01:28 +0000 (14:01 +0100)
committerAnatoliy Belsky <ab@php.net>
Fri, 23 Nov 2012 13:01:28 +0000 (14:01 +0100)
* PHP-5.4:
  Backported the fix for bug #63248 from 5.4+


Trivial merge