Merge branch 'PHP-5.3' into PHP-5.4
authorPierre Joye <pierre.php@gmail.com>
Tue, 27 Mar 2012 12:02:07 +0000 (14:02 +0200)
committerPierre Joye <pierre.php@gmail.com>
Tue, 27 Mar 2012 12:02:07 +0000 (14:02 +0200)
commita8174653e33479c850342cd9f9b5e7898f52ad8d
tree16fe980a2011b3df75d639e9d04b48fdbbde3337
parent50bdc486855f450e733bc529ac0ce4f5f52ce405
parentd0e3289d126739ddfd72409e6ff40e7f98c14f2b
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  - fix test for 5.11
  Fix bug #61504, potential vuln. in fileinfo. update to 5.11
ext/fileinfo/libmagic/print.c