Merge branch 'master' into notes
authorTom Hughes <tom@compton.nu>
Mon, 15 Oct 2012 21:38:13 +0000 (22:38 +0100)
committerTom Hughes <tom@compton.nu>
Mon, 15 Oct 2012 21:38:13 +0000 (22:38 +0100)
1  2 
config/locales/en.yml

Simple merge