wollac11/panic_bot — pull request #2 by wollac11 (2013-07-11 21:17:49+00:00)
Title: Resync

Merge directions fixes