]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorJulien Pauli <jpauli@php.net>
Fri, 12 Dec 2014 15:50:42 +0000 (16:50 +0100)
committerJulien Pauli <jpauli@php.net>
Fri, 12 Dec 2014 15:50:42 +0000 (16:50 +0100)
commita0d848f795b14996d1707f5a5059f8ffe83e3095
tree9c6ec343b4581a42fd6e4600401241060acc0523
parent4cda98264ec4ab80e9ca54c10cf2f332d6e09290
parentd43d0663af9d7f11985fa6994f785b2dd5cb0faa
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Updated NEWS
  Fix bug #68532: convert.base64-encode omits padding bytes
main/streams/memory.c