From: Evan Prodromou <evan@status.net>
Date: Wed, 12 Jan 2011 23:05:56 +0000 (-0500)
Subject: Merge branch '0.9.x' into 1.0.x
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=f9b2feb7f563663d6b564a3cb9223b7c1ea5ecef;p=quix0rs-gnu-social.git

Merge branch '0.9.x' into 1.0.x

Conflicts:
	README
---

f9b2feb7f563663d6b564a3cb9223b7c1ea5ecef