]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f6896e4 7311087)
Merge branch 'PHP-5.3' into PHP-5.4
authorJohannes Schlüter <johannes@php.net>
Thu, 14 Aug 2014 15:13:44 +0000 (17:13 +0200)
committerJohannes Schlüter <johannes@php.net>
Thu, 14 Aug 2014 15:13:44 +0000 (17:13 +0200)
1  2 
README.GIT-RULES patch | diff1 | diff2 | blob | history

diff --cc README.GIT-RULES
Simple merge
Unnamed repository; edit this file 'description' to name the repository.