]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorLior Kaplan <kaplanlior@gmail.com>
Tue, 17 Jun 2014 21:11:35 +0000 (00:11 +0300)
committerLior Kaplan <kaplanlior@gmail.com>
Tue, 17 Jun 2014 21:11:35 +0000 (00:11 +0300)
* PHP-5.4:
  Update copyright year to 2014
  Update copyright year to 2014


Trivial merge