From: Evan Prodromou <evan@status.net>
Date: Tue, 22 Mar 2011 22:17:09 +0000 (-0400)
Subject: Merge branch 'limitdist' of gitorious.org:~evan/statusnet/evans-mainline into limitdist
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=fd8dad39633870d2d71c3829a756e724acb45c2a;p=quix0rs-gnu-social.git

Merge branch 'limitdist' of gitorious.org:~evan/statusnet/evans-mainline into limitdist

Conflicts:
	classes/Notice.php
---

fd8dad39633870d2d71c3829a756e724acb45c2a