mozilla/socorro — pull request #2518 by rhelmer (2014-12-18 00:45:41+00:00)
Title: fix bug 1112932 - remove conflict markers

@lonnen - did I pick the right side of the conflict here?