]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorDmitry Stogov <dmitry@zend.com>
Wed, 8 Apr 2015 12:54:10 +0000 (15:54 +0300)
committerDmitry Stogov <dmitry@zend.com>
Wed, 8 Apr 2015 12:54:10 +0000 (15:54 +0300)
commitec0b888a82415365f8824139e931d20768715db2
tree8a822116ad22ad3b938e9e3abfb5e73c74fd6a5a
parent7e9a1c1e3fb391eb06c2d7f46bfa38c97a6d72a1
parent1955403ed59d161d59191401fb8acf543878df68
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed typo
ext/dba/dba.c