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)
commit8197ab3f82f343dd305b817e7676647354d0aea5
treefabc1ab8a90301ecc9bc412fcd1696b03ebc80cf
parentd2585ea0445ea5190fdbd578911c7e3489856086
parent886c8597841fb3e2a36927b49b189822b57f155e
Merge branch 'copyright'
config/locales/en.yml