Merge branch 'master' into notes
authorTom Hughes <tom@compton.nu>
Tue, 16 Apr 2013 17:22:47 +0000 (18:22 +0100)
committerTom Hughes <tom@compton.nu>
Tue, 16 Apr 2013 17:22:47 +0000 (18:22 +0100)
1  2 
app/assets/stylesheets/common.css.scss
config/locales/en.yml

Simple merge