Merge branch 'master' into terms
authorTom Hughes <tom@compton.nu>
Tue, 11 May 2010 18:07:00 +0000 (19:07 +0100)
committerTom Hughes <tom@compton.nu>
Tue, 11 May 2010 18:07:00 +0000 (19:07 +0100)
commit836e926e629a140fcdbb4b8489dc2caba5018439
tree94b7ed44b3578be559fd92bb959235756f523fb5
parent89ec02ea0af6b7b64df007ac20016cce4163621e
parentd1eb6d6041d34d98558ada41696e06f7a4d74ca3
Merge branch 'master' into terms
config/locales/de.yml