]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorAnatoliy Belsky <ab@php.net>
Tue, 13 Nov 2012 18:48:34 +0000 (19:48 +0100)
committerAnatoliy Belsky <ab@php.net>
Tue, 13 Nov 2012 18:48:34 +0000 (19:48 +0100)
* PHP-5.4:
  Enabled apache 2.4 handler build option


Trivial merge