]> granicus.if.org Git - php/commitdiff
Merge branch 'pull-request/1047'
authorAnatol Belski <ab@php.net>
Fri, 6 Feb 2015 10:18:46 +0000 (11:18 +0100)
committerAnatol Belski <ab@php.net>
Fri, 6 Feb 2015 10:18:46 +0000 (11:18 +0100)

Trivial merge