]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorFerenc Kovacs <tyrael@php.net>
Tue, 26 Aug 2014 22:47:37 +0000 (00:47 +0200)
committerFerenc Kovacs <tyrael@php.net>
Tue, 26 Aug 2014 22:47:37 +0000 (00:47 +0200)
* PHP-5.4:
  update the GIT-RULES with the 5.6 and the release branches


Trivial merge