]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4'
authorMartin Jansen <mj@php.net>
Tue, 20 Mar 2012 10:15:36 +0000 (11:15 +0100)
committerMartin Jansen <mj@php.net>
Tue, 20 Mar 2012 10:15:36 +0000 (11:15 +0100)
* PHP-5.4:
  Bump copyright year.


Trivial merge