]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorAnatol Belski <ab@php.net>
Thu, 27 Feb 2014 08:26:48 +0000 (09:26 +0100)
committerAnatol Belski <ab@php.net>
Thu, 27 Feb 2014 08:26:48 +0000 (09:26 +0100)
* PHP-5.5:
  update libs_version.txt

Conflicts:
win32/build/libs_version.txt


Trivial merge