]> granicus.if.org Git - php/commitdiff
Merge branch 'master' of git.php.net:php-src
authorDmitry Stogov <dmitry@zend.com>
Wed, 1 Jul 2015 13:32:13 +0000 (16:32 +0300)
committerDmitry Stogov <dmitry@zend.com>
Wed, 1 Jul 2015 13:32:13 +0000 (16:32 +0300)
* 'master' of git.php.net:php-src:
  change the inclusion order which fixes the vc build


Trivial merge