From: Martin Jansen <mj@php.net>
Date: Tue, 20 Mar 2012 10:15:28 +0000 (+0100)
Subject: Merge branch 'PHP-5.3' into PHP-5.4
X-Git-Tag: php-5.5.0alpha1~417^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c337f69157f95402650dded274919ded47d0a78e;p=php

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Bump copyright year.
---

c337f69157f95402650dded274919ded47d0a78e