Merge branch 'copyright'
authorTom Hughes <tom@compton.nu>
Thu, 22 Apr 2010 10:13:14 +0000 (11:13 +0100)
committerTom Hughes <tom@compton.nu>
Thu, 22 Apr 2010 10:13:14 +0000 (11:13 +0100)
1  2 
config/locales/en.yml

Simple merge