]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorHannes Magnusson <bjori@mongodb.com>
Wed, 5 Feb 2014 18:15:50 +0000 (10:15 -0800)
committerHannes Magnusson <bjori@mongodb.com>
Wed, 5 Feb 2014 18:15:50 +0000 (10:15 -0800)
commitb855367551a743e3119393f9592ac65dcbef7619
treee2b54c2030f1b8a8deb8234e8aba37378d2ddf49
parentfd87b38c4793ee4b5d5509e8bfa962ede8ed5228
parent1e0fdf0256c3e682e67c201dd461e4d1a7448f1b
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix year