Merge branch 'master' into terms
authorTom Hughes <tom@compton.nu>
Wed, 5 May 2010 14:29:48 +0000 (15:29 +0100)
committerTom Hughes <tom@compton.nu>
Wed, 5 May 2010 14:29:48 +0000 (15:29 +0100)
1  2 
config/environment.rb
config/locales/de.yml
config/locales/en.yml
config/routes.rb

Simple merge
Simple merge
Simple merge
Simple merge