From: Evan Prodromou <evan@controlyourself.ca>
Date: Mon, 10 Aug 2009 20:33:36 +0000 (-0400)
Subject: Merge branch 'master' of git@gitorious.org:laconica/mainline
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=6aee059033981cbf2499026a8697375fc7987a9e;p=quix0rs-gnu-social.git

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

6aee059033981cbf2499026a8697375fc7987a9e