jmaher/alert_manager — pull request #83 by kaustabh (2014-09-19 15:49:38+00:00)
Title: Conflicted buglist fixed

This should fix up the bug_conflict