From: Evan Prodromou <evan@status.net>
Date: Sun, 24 Jan 2010 20:59:57 +0000 (-0500)
Subject: Merge branch 'master' into 0.9.x
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=54ebb0a2b99aa1a9a6a27b61e47d12692ded65b4;p=quix0rs-gnu-social.git

Merge branch 'master' into 0.9.x

Conflicts:
	lib/stompqueuemanager.php
---

54ebb0a2b99aa1a9a6a27b61e47d12692ded65b4