]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorHannes Magnusson <bjori@mongodb.com>
Wed, 5 Feb 2014 18:18:10 +0000 (10:18 -0800)
committerHannes Magnusson <bjori@mongodb.com>
Wed, 5 Feb 2014 18:18:10 +0000 (10:18 -0800)
* PHP-5.6:
  Fix year


Trivial merge