]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.3' into PHP-5.4
authorFelipe Pena <felipensp@gmail.com>
Thu, 24 May 2012 16:43:35 +0000 (13:43 -0300)
committerFelipe Pena <felipensp@gmail.com>
Thu, 24 May 2012 16:43:35 +0000 (13:43 -0300)
commit84b2c39920ff02c86a46eb9191c140a887938371
tree2eb6981dc3cdcad02f648aa5e47138c56e0c8660
parenta10da87c6a2cadc5151d185573b0125d06daad6b
parent11b4f3becd371dae9f76ec18d2197edf53130db7
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  - Fixed magic file regex support