]> granicus.if.org Git - php/commit
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)
commit4113b5aee3048e49919c2dfa9e3d0c9ff622e83d
treeeab2eaee129054a18d4a88151252369922f0efdb
parentc6a218c76b4f987e692e5e5d3961a1e1f7816fba
parentefbf573e9fcbbd0236177b7538d720f94c1f730a
Merge branch 'PHP-5.5'

* PHP-5.5:
  - BFN
  - Fixed bug #63983 (enabling FPM borks compile on FreeBSD) patch by: chibisuke at web dot de