From: Brion Vibber <brion@pobox.com>
Date: Thu, 25 Mar 2010 18:43:26 +0000 (-0700)
Subject: Merge commit 'origin/master' into testing
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=800b33590696e85480aa73c25261d80f1926e56d;p=quix0rs-gnu-social.git

Merge commit 'origin/master' into testing

Conflicts:
	classes/Notice.php
---

800b33590696e85480aa73c25261d80f1926e56d