]> granicus.if.org Git - php/commitdiff
Merge branch 'phpng' of git.php.net:php-src into phpng
authorDmitry Stogov <dmitry@zend.com>
Wed, 7 May 2014 11:14:41 +0000 (15:14 +0400)
committerDmitry Stogov <dmitry@zend.com>
Wed, 7 May 2014 11:14:41 +0000 (15:14 +0400)
* 'phpng' of git.php.net:php-src:
  fix exif, thnx laruence


Trivial merge