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)
commit52611a5bfa69165179bd871b925b5f8b14942e2e
treeae682d4a2e8ff0b4d2b8314d45dd3c0ce590682a
parent7f598ab412674ce5a78da98c54aa2fe2e4a05792
parent7614534bdb738821e20d04bbf44c4628313ae24f
Merge branch 'master' into notes
app/assets/stylesheets/common.css.scss
config/locales/en.yml