Nikolaj64/Modular-Node.js-IRC-bot — pull request #1 by GlitchMr (2012-06-15 12:16:18+00:00)
Title: Resolve merge conflict

This commit fixes merge conflict which happened in latest commit.