]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorAnatol Belski <ab@php.net>
Thu, 24 Apr 2014 18:15:01 +0000 (20:15 +0200)
committerAnatol Belski <ab@php.net>
Thu, 24 Apr 2014 18:15:01 +0000 (20:15 +0200)
commit305c025cdd26fb419565f69b6ad1f17a114c13bc
tree7b2bf673f5da48ba9ec7b09298b562db1635d380
parent8f43032ea4d648ae3ec7edc9cf304692a73a828d
parentdb960e82b406a9dc5ce325b8a8e8ab72088ae788
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  updated libmagic.patch