]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorFerenc Kovacs <tyra3l@gmail.com>
Fri, 6 Dec 2013 10:07:36 +0000 (11:07 +0100)
committerFerenc Kovacs <tyra3l@gmail.com>
Fri, 6 Dec 2013 10:07:36 +0000 (11:07 +0100)

Trivial merge