]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorFelipe Pena <felipensp@gmail.com>
Wed, 26 Jun 2013 18:08:57 +0000 (15:08 -0300)
committerFelipe Pena <felipensp@gmail.com>
Wed, 26 Jun 2013 18:08:57 +0000 (15:08 -0300)
* PHP-5.5:
  - BFN
  - Fixed bug #63983 (enabling FPM borks compile on FreeBSD) patch by: chibisuke at web dot de


Trivial merge