]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 39a2dcd 8ee6fe9)
Merge branch 'PHP-5.5' into PHP-5.6
authorMichael Wallner <mike@php.net>
Thu, 12 Dec 2013 11:09:54 +0000 (12:09 +0100)
committerMichael Wallner <mike@php.net>
Thu, 12 Dec 2013 11:09:54 +0000 (12:09 +0100)
* PHP-5.5:
  fix test


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