]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorAnatol Belski <ab@php.net>
Mon, 16 Mar 2015 07:34:14 +0000 (08:34 +0100)
committerAnatol Belski <ab@php.net>
Mon, 16 Mar 2015 07:34:14 +0000 (08:34 +0100)
commit8f898c07062aa441b006309fb7ece7c66dce9ae4
tree82c66686dad5783e2d23b7f75fdf99f2dc3c143f
parentaf2b0669110ead1d946237500d1e0a4151f0e450
parent293d6e629db9db8fd18cb9d15fb38b929cba707b
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  backport af2b0669 into 5.5