edx/edx-tim — pull request #45 by wedaly (2014-02-25 16:39:38+00:00)
Title: Fix duplicate line from bad rebase

@stephensanchez