From e8c9b7d4f23c2cce6eb8a7ced43648b8c3a5fa5e Mon Sep 17 00:00:00 2001
From: Rafael Ortiz <rafael@activitycentral.com>
Date: Fri, 17 Jun 2011 18:32:03 +0000
Subject: Merge branch 'master' of git.sugarlabs.org:speak/mainline

---
(limited to 'chatbox.py')

--
cgit v0.9.1