From: Evan Prodromou <evan@status.net>
Date: Sun, 24 Jan 2010 21:12:40 +0000 (-0500)
Subject: Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=4f213f985f292bab3d54671325954cae34c23fd3;p=quix0rs-gnu-social.git

Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

Conflicts:
	lib/stompqueuemanager.php
---

4f213f985f292bab3d54671325954cae34c23fd3