From: Evan Prodromou <evan@status.net>
Date: Mon, 28 Dec 2009 23:50:41 +0000 (-0800)
Subject: Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=a1e599640419bd1ea1f251b9e19e50522bda4de5;p=quix0rs-gnu-social.git

Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

Conflicts:
	scripts/setconfig.php
---

a1e599640419bd1ea1f251b9e19e50522bda4de5