]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorJulien Pauli <jpauli@php.net>
Fri, 12 Dec 2014 15:51:50 +0000 (16:51 +0100)
committerJulien Pauli <jpauli@php.net>
Fri, 12 Dec 2014 15:51:50 +0000 (16:51 +0100)
* PHP-5.6:
  Updated NEWS
  Updated NEWS
  Fix bug #68532: convert.base64-encode omits padding bytes

1  2 
main/streams/memory.c

Simple merge