]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.3' into PHP-5.4
authorAnatoliy Belsky <ab@php.net>
Tue, 29 May 2012 15:41:57 +0000 (17:41 +0200)
committerAnatoliy Belsky <ab@php.net>
Tue, 29 May 2012 15:41:57 +0000 (17:41 +0200)
* PHP-5.3:
  updated the libmagic patch after Felipes regex fix


Trivial merge