]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorAnatol Belski <ab@php.net>
Sat, 27 Apr 2013 12:09:55 +0000 (14:09 +0200)
committerAnatol Belski <ab@php.net>
Sat, 27 Apr 2013 12:09:55 +0000 (14:09 +0200)
commitca148c030fd71203ea026263ce99be3ec49f0865
tree7bf92316fc64d3766ff3f557c8fd2e188104cb7d
parentd72307f1ca84b9a4c92ed90b9763b06720774caa
parente9b03c412ba44826de2c8150c7a930fe9aa17074
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  updated libmagic.patch