]> granicus.if.org Git - php/commit
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)
commit1e1b7c74fb8b68aacb3948c2c499917397f82d29
treea43f2432649f1e4911e5739a0035ca625351c9f3
parentf463523cdade48b741668ae2e80c866b4e3e753e
parent52f35b984c4a1cc6e1e951a9c1d777ceb20e5606
Merge branch 'PHP-5.4' into PHP-5.5

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