]> granicus.if.org Git - php/commitdiff
Merge branch 'master' of git.php.net:/php-src
authorJohannes Schlüter <johannes@php.net>
Wed, 17 Oct 2012 16:27:40 +0000 (18:27 +0200)
committerJohannes Schlüter <johannes@php.net>
Wed, 17 Oct 2012 16:27:40 +0000 (18:27 +0200)

Trivial merge