]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorBob Weinand <bobwei9@hotmail.com>
Thu, 17 Apr 2014 15:23:05 +0000 (17:23 +0200)
committerBob Weinand <bobwei9@hotmail.com>
Thu, 17 Apr 2014 15:23:05 +0000 (17:23 +0200)

Trivial merge