]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorRemi Collet <remi@php.net>
Sat, 24 Nov 2012 14:03:09 +0000 (15:03 +0100)
committerRemi Collet <remi@php.net>
Sat, 24 Nov 2012 14:03:09 +0000 (15:03 +0100)
* PHP-5.4:
  Fixed Bug #63126 DISABLE_AUTHENTICATOR ignores array


Trivial merge