]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4'
authorFelipe Pena <felipensp@gmail.com>
Sun, 29 Apr 2012 22:14:20 +0000 (19:14 -0300)
committerFelipe Pena <felipensp@gmail.com>
Sun, 29 Apr 2012 22:14:20 +0000 (19:14 -0300)
* PHP-5.4:
  - Added missing bound check in iptcparse() (path by chris at chiappa.net)


Trivial merge