From: Evan Prodromou <evan@controlyourself.ca>
Date: Tue, 19 May 2009 18:42:19 +0000 (-0400)
Subject: Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=8cc8f9fd0c0ad8d1c38bd0c113f9f0a4d7918256;p=quix0rs-gnu-social.git

Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x

Conflicts:
	config.php.sample
---

8cc8f9fd0c0ad8d1c38bd0c113f9f0a4d7918256