]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorReeze Xia <reeze@php.net>
Sun, 1 Mar 2015 07:08:20 +0000 (15:08 +0800)
committerReeze Xia <reeze@php.net>
Sun, 1 Mar 2015 07:08:20 +0000 (15:08 +0800)
commit214350f4f44c006b1db2208e93bfaed6960b01b2
tree26eaf0ecbe6bceeca1d336c73d63aaba9e0785e3
parent6ef477f947ec65bd5f71f2e4e016bbcc469f4257
parentc98eb695b5b804a6892b020290a6589781e6126e
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Bump header year