From: Scott Worley <sworley@chkno.net>
Date: Fri, 3 Aug 2012 01:38:31 +0000 (-0700)
Subject: Merge skitch's changes.
X-Git-Url: http://git.scottworley.com/reliable-chat/commitdiff_plain/99c1f307f81cc3d92541e41bab1df1f79d83517e?hp=99c1f307f81cc3d92541e41bab1df1f79d83517e

Merge skitch's changes.

Conflicts:
	webclient/rc.html
---