]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: aa31d7e 891bd46)
Merge branch 'PHP-5.4' into PHP-5.5
authorFelipe Pena <felipensp@gmail.com>
Wed, 26 Jun 2013 18:08:51 +0000 (15:08 -0300)
committerFelipe Pena <felipensp@gmail.com>
Wed, 26 Jun 2013 18:08:51 +0000 (15:08 -0300)
* PHP-5.4:
  - BFN
  - Fixed bug #63983 (enabling FPM borks compile on FreeBSD) patch by: chibisuke at web dot de


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