]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorLior Kaplan <kaplanlior@gmail.com>
Mon, 16 Jun 2014 20:36:39 +0000 (23:36 +0300)
committerLior Kaplan <kaplanlior@gmail.com>
Mon, 16 Jun 2014 20:36:39 +0000 (23:36 +0300)
* PHP-5.6:
  Update copyright year to 2014
  Update copyright year for re2c generated files
  Update copyright year to 2014
  Update copyright year for re2c files as well


Trivial merge