]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorAnatol Belski <ab@php.net>
Thu, 20 Feb 2014 18:00:36 +0000 (19:00 +0100)
committerAnatol Belski <ab@php.net>
Thu, 20 Feb 2014 18:00:36 +0000 (19:00 +0100)
commite244e2245b9705329d92b92fb0d0d0f50d5af9a4
treed0182bcdbae5142016b704752800eda8d6d045d2
parent6d4d4155d26f8725365ee24797ecd14cba049a53
parentce1fd72776292dd81c0e39d470631d9a3f62ddb6
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  updated libmagic.patch in 5.4/5