]> granicus.if.org Git - php/commitdiff
Merge branch 'master' of git.php.net:php-src
authorAndrey Hristov <andrey@php.net>
Tue, 26 Nov 2013 18:10:17 +0000 (20:10 +0200)
committerAndrey Hristov <andrey@php.net>
Tue, 26 Nov 2013 18:10:17 +0000 (20:10 +0200)

Trivial merge