Merge branch 'master' into terms
authorTom Hughes <tom@compton.nu>
Tue, 27 Apr 2010 10:22:25 +0000 (11:22 +0100)
committerTom Hughes <tom@compton.nu>
Tue, 27 Apr 2010 10:22:25 +0000 (11:22 +0100)
commit67292724441a7a447a9ea579a36dee64825dedaf
tree337b0482a4ff6e3fa839a0d97a5e5c01e4bd4482
parent9241ecc8eecf08123415640727bf47afe617cd0c
parenta97ae09d2acc136b24f7f1794b4fba1159cee246
Merge branch 'master' into terms
config/locales/de.yml
config/locales/en.yml
config/routes.rb
public/stylesheets/common.css