From 15758583c51de734d49f2af241ca87e53ca7e2e6 Mon Sep 17 00:00:00 2001
From: Simon Schampijer <simon@schampijer.de>
Date: Sat, 01 Sep 2007 11:46:14 +0000
Subject: Merge branch 'master' into json

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

--
cgit v0.9.1