From: Evan Prodromou <evan@status.net>
Date: Thu, 24 Sep 2009 21:24:15 +0000 (-0400)
Subject: Merge branch '0.8.x' into 0.9.x
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=93b7e601156d88399b57ef9cd2962a22350270a8;p=quix0rs-gnu-social.git

Merge branch '0.8.x' into 0.9.x

Conflicts:
	EVENTS.txt
---

93b7e601156d88399b57ef9cd2962a22350270a8