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)
commit64788e3110e7c6d334aa3ad9bfaa2f68b757b4cf
treeafa29aaadd44012cc4289e9e924d6d9cb0fa9f64
parentbc910a7ce46d5bb1f8684c0c0e813c0ece7f6676
parent9d8ed21bd52a730b6dde3a66e3ba544433b61a11
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Backported the fix for bug #63248 from 5.4+