Merge branch 'master' into terms
authorTom Hughes <tom@compton.nu>
Mon, 19 Apr 2010 20:05:54 +0000 (21:05 +0100)
committerTom Hughes <tom@compton.nu>
Mon, 19 Apr 2010 20:05:54 +0000 (21:05 +0100)
1  2 
config/locales/de.yml

Simple merge