]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorBob Weinand <bobwei9@hotmail.com>
Sun, 13 Apr 2014 17:41:27 +0000 (19:41 +0200)
committerBob Weinand <bobwei9@hotmail.com>
Sun, 13 Apr 2014 17:41:27 +0000 (19:41 +0200)

Trivial merge