From: Evan Prodromou <evan@status.net>
Date: Wed, 23 Mar 2011 19:58:27 +0000 (-0400)
Subject: Merge branch '1.0.x' into limitdist
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=eb1faa78658669bff57288ff48a4af4aa1a89c1b;p=quix0rs-gnu-social.git

Merge branch '1.0.x' into limitdist

Conflicts:
	classes/Notice.php
---

eb1faa78658669bff57288ff48a4af4aa1a89c1b