From: Rick L Bird <nveid@yahoo.com>
Date: Fri, 6 May 2011 04:54:01 +0000 (-0400)
Subject: Merge branch 'master' of cobramush.org:cobramush
X-Git-Url: https://git.theari.com/?a=commitdiff_plain;h=56631a1388e339adcb7eaac600830b42bd6e2e3c;p=cobramush.git

Merge branch 'master' of cobramush.org:cobramush

Conflicts:
	hdrs/extchat.h
---

56631a1388e339adcb7eaac600830b42bd6e2e3c