Merge branch 'dev' into staging
Update integration repo.
fixed migration rebasing order
few test updates
Merge pull request #155 from jdragojevic/wd-updates-3

few test updates
2340: pull descriptions for uploads from extant tip, not public
2324: Do *not* show private subs, unless it's the one you're editing, of course.

Also did refactor the name of subtitles to subtitleData when appropriate.
Updated integration repo
Updated integration repo
2324: Fixed typo
Merge branch 'staging' into dev
2345: Fixed display of language on the lineage for the subtitle editor
Merge branch 'i-2340' into staging
Unbreak the Task admin

MySQL was using temporary tables again and locking up the DB for a few minutes
whenever you hit the Task admin page.  Whee.
selenium tests for delete subtitle language
Merge pull request #156 from jdragojevic/wd-del-sub-lang-1

selenium tests for delete subtitle language
test updates
Merge pull request #157 from jdragojevic/wd-updates-4

test updates
Merge branch 'dev' of git://github.com/pculture/unisubs into dev