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)
commitffd7b02b0c3696ffa5d38ddeeb8078df19e841e0
treed9bb1f52c6a32d8f32bc130ef10181fc8738e33b
parent67292724441a7a447a9ea579a36dee64825dedaf
parent3190cd88ded2a4edd76b031abe033f7dd72d6ecb
Merge branch 'master' into terms
config/environment.rb
config/locales/de.yml
config/locales/en.yml
config/routes.rb