]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorAnatol Belski <ab@php.net>
Tue, 27 May 2014 20:38:30 +0000 (22:38 +0200)
committerAnatol Belski <ab@php.net>
Tue, 27 May 2014 20:38:30 +0000 (22:38 +0200)
commite84405576132a981f9b510cf99bbe67e8434a51b
tree6ca20e46a8bcf0b98ee705a91606d6b4b434209e
parent13a3826687d270f6154c489244feffcecf33f838
parent546797f3296b5fddda13c5756feadcaed72b37d0
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  updated libmagic.patch for 5.4+