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)
1  2 
config/locales/de.yml

Simple merge