]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorBob Weinand <bobwei9@hotmail.com>
Sun, 15 Jun 2014 22:42:50 +0000 (00:42 +0200)
committerBob Weinand <bobwei9@hotmail.com>
Sun, 15 Jun 2014 22:42:50 +0000 (00:42 +0200)

Trivial merge