Merge branch 'PHP-5.5' into PHP-5.6
authorStanislav Malyshev <stas@php.net>
Tue, 20 Jan 2015 21:27:51 +0000 (13:27 -0800)
committerStanislav Malyshev <stas@php.net>
Tue, 20 Jan 2015 21:27:51 +0000 (13:27 -0800)
commit73a5958e67dadfdded866fc796556bd0c37360d2
tree8c260b4a81cabb2207fa04dba3472e235798b055
parentb2a254fe2d02ca4c3706223c962c55df2dc3adec
parentcca3c8a9852db83d2acd16810fe2b426aa047752
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix year