From: yomguy <yomguy@parisson.com>
Date: Mon, 4 Feb 2013 13:36:07 +0000 (+0100)
Subject: Merge branch 'master' of github.com:yomguy/django-jqchat
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=79367e810789175ec4858462865d103081882846;p=django-jqchat.git

Merge branch 'master' of github.com:yomguy/django-jqchat

Conflicts:
	jqchat/views.py
---

79367e810789175ec4858462865d103081882846