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

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix year
---

ae310e078de3c545a1bade3f5a07d8c1d05d953a