]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorHannes Magnusson <bjori@mongodb.com>
Wed, 5 Feb 2014 18:17:49 +0000 (10:17 -0800)
committerHannes Magnusson <bjori@mongodb.com>
Wed, 5 Feb 2014 18:17:49 +0000 (10:17 -0800)
commitae310e078de3c545a1bade3f5a07d8c1d05d953a
tree1e73cec6e17deefea705f92a8230429372d1c5ed
parent5180425ca9ede2c0178eca64252e4680549fd1e6
parentb855367551a743e3119393f9592ac65dcbef7619
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix year