]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorAnatol Belski <ab@php.net>
Thu, 24 Apr 2014 17:52:53 +0000 (19:52 +0200)
committerAnatol Belski <ab@php.net>
Thu, 24 Apr 2014 17:52:53 +0000 (19:52 +0200)
commit8f43032ea4d648ae3ec7edc9cf304692a73a828d
tree7b2bf673f5da48ba9ec7b09298b562db1635d380
parent0c381e19ad9967eaef44a12f8e259c33436913bb
parentd7bb09cc1d7d413d7e92128028c0b2a11b21b6da
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  backport this piece from 5.6, related to the #66307 fix