]> granicus.if.org Git - php/commitdiff
Merge branch 'master' of git.php.net:php-src
authorDmitry Stogov <dmitry@zend.com>
Mon, 15 Sep 2014 10:37:59 +0000 (14:37 +0400)
committerDmitry Stogov <dmitry@zend.com>
Mon, 15 Sep 2014 10:37:59 +0000 (14:37 +0400)
* 'master' of git.php.net:php-src:
  fix initializer struct
  fix signature
  fix type
  fix condition


Trivial merge