]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.3' into PHP-5.4
authorAnatoliy Belsky <ab@php.net>
Wed, 28 Mar 2012 10:10:25 +0000 (12:10 +0200)
committerAnatoliy Belsky <ab@php.net>
Wed, 28 Mar 2012 10:10:25 +0000 (12:10 +0200)
* PHP-5.3:
  Bug 61504 updated libmagic.patch
  Bug #61504 TSRML_FETCH() must be last


Trivial merge