From: Hannes Magnusson <bjori@mongodb.com>
Date: Wed, 5 Feb 2014 18:15:50 +0000 (-0800)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.6.0alpha2~1^2~13^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b855367551a743e3119393f9592ac65dcbef7619;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix year
---

b855367551a743e3119393f9592ac65dcbef7619