From 4346abe0f809bc3a03052a778e2f42a0e8f1e269 Mon Sep 17 00:00:00 2001
From: Rafael Ortiz <dirakx@gmail.com>
Date: Sun, 23 Jan 2011 23:20:06 +0000
Subject: Merge branch 'master' of git://git.sugarlabs.org/speak/mainline

---
(limited to 'bot')

--
cgit v0.9.1