From: Brion Vibber <brion@status.net>
Date: Sat, 20 Nov 2010 00:18:53 +0000 (-0800)
Subject: Merge branch 'master' into 0.9.x
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=cff14c7e10b5125874438215fb799bccaa9337ea;p=quix0rs-gnu-social.git

Merge branch 'master' into 0.9.x
---

cff14c7e10b5125874438215fb799bccaa9337ea