]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorFerenc Kovacs <tyrael@php.net>
Sat, 12 Apr 2014 23:57:15 +0000 (01:57 +0200)
committerFerenc Kovacs <tyrael@php.net>
Sat, 12 Apr 2014 23:57:15 +0000 (01:57 +0200)
commit51cbb85ea9ef758b75bf718985f634b83eb57b34
treeb047f2debffa5df6516601c224236015c6f5d930
parent53b1dce587e73bd445d4b2fc35c196d2d20741dd
parent2876bde63494129b78c393851c5f8101e6f9fdf0
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix typo
main/SAPI.c