From: Evan Prodromou <evan@controlyourself.ca>
Date: Sun, 5 Jul 2009 16:05:19 +0000 (-0400)
Subject: Merge branch 'master' of git@gitorious.org:laconica/mainline
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=bfae5489cb629331f2936b2bf1066adb3976bce1;p=quix0rs-gnu-social.git

Merge branch 'master' of git@gitorious.org:laconica/mainline
---

bfae5489cb629331f2936b2bf1066adb3976bce1