From: Felipe Pena <felipensp@gmail.com>
Date: Sun, 29 Apr 2012 22:14:03 +0000 (-0300)
Subject: Merge branch 'PHP-5.3' into PHP-5.4
X-Git-Tag: php-5.4.4RC1~79
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6008f9af8fa6beab92a4c96d11d641c95f97162c;p=php

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  - Added missing bound check in iptcparse() (path by chris at chiappa.net)
---

6008f9af8fa6beab92a4c96d11d641c95f97162c