Merge remote-tracking branch 'origin/master' into routing
authorTom Hughes <tom@compton.nu>
Sat, 8 Mar 2014 17:44:22 +0000 (17:44 +0000)
committerTom Hughes <tom@compton.nu>
Sat, 8 Mar 2014 17:44:22 +0000 (17:44 +0000)
commitb095b59d5e0ee805e49980af80b21bd1acff1345
tree9ea1dd6a89958a10d3f3e5ae791b69810f8c742e
parent5c0e96e0e0e99b3469c286f4bf77d4d0abf47c79
parent8c82be0537e1bbdcbd7f20d5f26deaae09774281
Merge remote-tracking branch 'origin/master' into routing

Conflicts:
app/views/layouts/_search.html.erb
app/assets/javascripts/index.js
app/assets/stylesheets/common.css.scss
app/views/layouts/_search.html.erb
config/locales/de.yml
config/locales/en.yml