]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorFelipe Pena <felipensp@gmail.com>
Tue, 17 Feb 2015 03:08:48 +0000 (01:08 -0200)
committerFelipe Pena <felipensp@gmail.com>
Tue, 17 Feb 2015 03:08:48 +0000 (01:08 -0200)
* PHP-5.5:


Trivial merge