From: Evan Prodromou <evan@controlyourself.ca>
Date: Mon, 11 May 2009 21:53:23 +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=99f8501d321ae9d8087abbe6523e28ce5fd095d3;p=quix0rs-gnu-social.git

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

Conflicts:
	config.php.sample
---

99f8501d321ae9d8087abbe6523e28ce5fd095d3