]> git.openstreetmap.org Git - rails.git/commitdiff
projects / rails.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 155ed85 d1eb6d6)
Merge branch 'master' into openid
authorTom Hughes <tom@compton.nu>
Tue, 11 May 2010 12:37:05 +0000 (13:37 +0100)
committerTom Hughes <tom@compton.nu>
Tue, 11 May 2010 12:37:05 +0000 (13:37 +0100)

Trivial merge
The OpenStreetMap web site