square/shuttle — pull request #64 by RickCSong (2014-02-25 23:58:44+00:00)
Title: Adds concordance translation search

Should be good to merge. @RISCfuture

Conflicts:
app/assets/javascripts/translation_workbench.js.coffee