]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorAnatol Belski <ab@php.net>
Fri, 25 Apr 2014 15:40:33 +0000 (17:40 +0200)
committerAnatol Belski <ab@php.net>
Fri, 25 Apr 2014 15:40:33 +0000 (17:40 +0200)
commit70fdb21d9354f34050c30842a313eddae766a580
tree22b0dfe5c995a06b99b4c3cc716ef6b64ab8ccaf
parent38248e445dd94fb7579c2c8f57b36a089030b43a
parent1c7f4d2b4bd797d2ce8d38fa0023d07484ea6c70
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fixed test