From: Dmitry Stogov <dmitry@zend.com>
Date: Wed, 7 May 2014 11:14:41 +0000 (+0400)
Subject: Merge branch 'phpng' of git.php.net:php-src into phpng
X-Git-Tag: POST_PHPNG_MERGE~384^2~24^2~15
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d5831bfa12f6a1863c1b5cf0575986cda99579db;p=php

Merge branch 'phpng' of git.php.net:php-src into phpng

* 'phpng' of git.php.net:php-src:
  fix exif, thnx laruence
---

d5831bfa12f6a1863c1b5cf0575986cda99579db