]> granicus.if.org Git - php/commitdiff
Merge branch 'master' of git.php.net:php-src
authorDmitry Stogov <dmitry@zend.com>
Wed, 11 Feb 2015 14:41:52 +0000 (17:41 +0300)
committerDmitry Stogov <dmitry@zend.com>
Wed, 11 Feb 2015 14:41:52 +0000 (17:41 +0300)
* 'master' of git.php.net:php-src:
  add missing test for class member access with deference relates to https://wiki.php.net/rfc/uniform_variable_syntax
  fix dir separator in test


Trivial merge