]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorFerenc Kovacs <tyrael@php.net>
Tue, 26 Aug 2014 22:47:57 +0000 (00:47 +0200)
committerFerenc Kovacs <tyrael@php.net>
Tue, 26 Aug 2014 22:47:57 +0000 (00:47 +0200)
commite0a177d6765b314ce5fef4719e77cc6cc60b26bc
treeb4b9fb2174c6b6f2a5bafa6684f872ff8860ccd1
parentdbe8c37476ad31b20b19c01220869d68a0a07a63
parent1e1b7c74fb8b68aacb3948c2c499917397f82d29
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  update the GIT-RULES with the 5.6 and the release branches