]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorAnatol Belski <ab@php.net>
Thu, 6 Feb 2014 08:17:29 +0000 (09:17 +0100)
committerAnatol Belski <ab@php.net>
Thu, 6 Feb 2014 08:17:29 +0000 (09:17 +0100)
commit8605702a7a7e0afe7ab9ae49404f3cabcb86fa08
tree262fe067b01fb63894cccd63d098ec64253dc6a3
parent6267c40ac501861b596a3fd203b20eba00778919
parente41059c63313178f14b085c150cfc70896ba91df
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  update libs_version.txt

Conflicts:
win32/build/libs_version.txt