]> granicus.if.org Git - php/commitdiff
Merge remote-tracking branch 'reeze/fix-phpcredits-bc'
authorNikita Popov <nikic@php.net>
Mon, 13 Aug 2012 19:23:06 +0000 (21:23 +0200)
committerNikita Popov <nikic@php.net>
Mon, 13 Aug 2012 19:23:06 +0000 (21:23 +0200)

Trivial merge