]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4'
authorFelipe Pena <felipensp@gmail.com>
Thu, 24 May 2012 16:43:53 +0000 (13:43 -0300)
committerFelipe Pena <felipensp@gmail.com>
Thu, 24 May 2012 16:43:53 +0000 (13:43 -0300)
* PHP-5.4:
  - Fixed magic file regex support


Trivial merge