]> granicus.if.org Git - php/commitdiff
Merge branch 'master' of git.php.net:php-src
authorDmitry Stogov <dmitry@zend.com>
Mon, 25 Mar 2013 11:49:18 +0000 (15:49 +0400)
committerDmitry Stogov <dmitry@zend.com>
Mon, 25 Mar 2013 11:49:18 +0000 (15:49 +0400)
* 'master' of git.php.net:php-src:
  add new functions and constants for GD


Trivial merge