]> granicus.if.org Git - php/commit
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)
commitd5831bfa12f6a1863c1b5cf0575986cda99579db
tree68b959a58811ef450b6b4a0871e0437dd2b98513
parent0c6a6f0fba3be20010e36e127f52e58531eee32d
parent1f9ecf42b6e9f89b28318bb01de034f9c3aaef38
Merge branch 'phpng' of git.php.net:php-src into phpng

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