]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorAnatol Belski <ab@php.net>
Thu, 27 Mar 2014 17:19:24 +0000 (18:19 +0100)
committerAnatol Belski <ab@php.net>
Thu, 27 Mar 2014 17:19:24 +0000 (18:19 +0100)
commit972c451c73029ba877d77a151771e4961ae5eaee
treebecfaf509871f23ee306f17bf0fa3f58e0a52637
parent84cd0f9911b7070f342aadc6b04e312152e2e3ca
parent1283722589a8cccd6c49aa9d9c78edeec43f094e
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  update lib versions

Conflicts:
win32/build/libs_version.txt
win32/build/libs_version.txt