]> granicus.if.org Git - php/commitdiff
Merge branch 'phpng' of git.php.net:php-src into phpng
authorPierre Joye <pierre.php@gmail.com>
Thu, 15 May 2014 08:17:11 +0000 (10:17 +0200)
committerPierre Joye <pierre.php@gmail.com>
Thu, 15 May 2014 08:17:11 +0000 (10:17 +0200)
# By Dmitry Stogov
# Via Dmitry Stogov
* 'phpng' of git.php.net:php-src:
  Fixed get_zval_property()


Trivial merge