]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 49cdde7 3c3ff43)
Merge branch 'PHP-5.4' into PHP-5.5
authorkrakjoe <joe.watkins@live.co.uk>
Wed, 1 Jan 2014 13:00:29 +0000 (13:00 +0000)
committerkrakjoe <joe.watkins@live.co.uk>
Wed, 1 Jan 2014 13:00:29 +0000 (13:00 +0000)
* PHP-5.4:
  fix #66375 bad logic in sapi header callback routine


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