]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorAnatol Belski <ab@php.net>
Mon, 10 Mar 2014 13:13:15 +0000 (14:13 +0100)
committerAnatol Belski <ab@php.net>
Mon, 10 Mar 2014 13:13:15 +0000 (14:13 +0100)
commitc17fd651650203a106b904e1cb6f82a3a7a37330
treee29e31f377f1d9c5630584cbb63826a84385c552
parent3a76cb2d9570f02fb189699c092ecf1f7491e424
parentb9d494a33b4052afc93fd87382760702bbbbcd2f
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  updated libmagic.patch