]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 23e4af1 83dda66)
Merge branch 'PHP-5.5' into PHP-5.6
authorMichael Wallner <mike@php.net>
Wed, 18 Feb 2015 13:06:39 +0000 (14:06 +0100)
committerMichael Wallner <mike@php.net>
Wed, 18 Feb 2015 13:06:39 +0000 (14:06 +0100)
* PHP-5.5:
  fix test


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