]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5cea7a9 b33824b)
Merge branch 'PHP-5.5'
authorMichael Wallner <mike@php.net>
Fri, 9 Aug 2013 09:39:41 +0000 (11:39 +0200)
committerMichael Wallner <mike@php.net>
Fri, 9 Aug 2013 09:39:41 +0000 (11:39 +0200)
* PHP-5.5:
  fix bug #65391
  Update NEWS
  Update NEWS

Conflicts:
ext/zlib/tests/bug65391.phpt


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.