Merge branch 'master' into notes
authorTom Hughes <tom@compton.nu>
Tue, 5 Feb 2013 19:03:28 +0000 (19:03 +0000)
committerTom Hughes <tom@compton.nu>
Tue, 5 Feb 2013 19:03:28 +0000 (19:03 +0000)
1  2 
config/locales/en.yml

Simple merge