]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorDavid Soria Parra <dsp@php.net>
Mon, 16 Dec 2013 18:27:51 +0000 (10:27 -0800)
committerDavid Soria Parra <dsp@php.net>
Mon, 16 Dec 2013 18:27:51 +0000 (10:27 -0800)

Trivial merge