]> granicus.if.org Git - php/commitdiff
Merge branch 'pull-request/1023'
authorAnatol Belski <ab@php.net>
Fri, 23 Jan 2015 19:57:47 +0000 (20:57 +0100)
committerAnatol Belski <ab@php.net>
Fri, 23 Jan 2015 19:57:47 +0000 (20:57 +0100)

Trivial merge