]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorFerenc Kovacs <tyrael@php.net>
Thu, 27 Feb 2014 01:32:07 +0000 (02:32 +0100)
committerFerenc Kovacs <tyrael@php.net>
Thu, 27 Feb 2014 01:32:07 +0000 (02:32 +0100)
commitfd20278fa58f77879124783d3207a7fd6e059199
tree02bc4c337d5baeeadcefdf8ff33791defc4c64e4
parent38797e598b6af7502f708b6a3d951fdb86272abe
parentbd961f3e873f71c1408111da065d94cd0c6527d9
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix tests broken by 633f898f1520253d3530fe91fc82f68bca7c4627