]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorDerick Rethans <github@derickrethans.nl>
Sun, 26 Jan 2014 13:02:55 +0000 (14:02 +0100)
committerDerick Rethans <github@derickrethans.nl>
Sun, 26 Jan 2014 13:02:55 +0000 (14:02 +0100)

Trivial merge