dropbox/phabricator — pull request #2 by charleseff (2013-09-10 22:35:03+00:00)
Title: Herald security fixed rebase

fixed rebase problem of last rebase attempt.

- reverted last commit
- re-applied with correct rebase conflict resolutions (hopefully)