From: Brion Vibber <brion@pobox.com>
Date: Tue, 16 Feb 2010 17:22:02 +0000 (-0800)
Subject: Merge branch 'master' into testing
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=81b6b58e33f55054b7e5dd546f06dbdb5696ed92;p=quix0rs-gnu-social.git

Merge branch 'master' into testing

Conflicts:
	lib/stompqueuemanager.php
---

81b6b58e33f55054b7e5dd546f06dbdb5696ed92