From: System Administrator <root@pro.(none)>
Date: Thu, 22 Sep 2011 22:37:45 +0000 (+0100)
Subject: Merge branch 'master' of https://github.com/M2Ys4U/KiwiIRC
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=f77b0e99d834f0ce3146aa18e95c3cba61534e6d;p=KiwiIRC.git

Merge branch 'master' of https://github.com/M2Ys4U/KiwiIRC

Conflicts:
	node/app.js
---

f77b0e99d834f0ce3146aa18e95c3cba61534e6d