mattjbrown/test-hooks — pull request #48 by zhenbot (2013-12-20 00:55:13+00:00)
Title: #45 - Fix merge conflict handling

Pull Request Auto-Created by Zhenbot™