]> granicus.if.org Git - php/commitdiff
Merge branch 'master' of git.php.net:php-src
authorDmitry Stogov <dmitry@zend.com>
Tue, 31 Mar 2015 13:36:26 +0000 (16:36 +0300)
committerDmitry Stogov <dmitry@zend.com>
Tue, 31 Mar 2015 13:36:26 +0000 (16:36 +0300)
* 'master' of git.php.net:php-src:
  force ext/odbc to be shared in snapshot build


Trivial merge