From: postblue <postblue+git@postblue.info>
Date: Fri, 6 Mar 2015 17:02:48 +0000 (+0100)
Subject: Merge branch 'nightly' of gitorious.org:social/mainline into nightly
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=1d8cc64bf0c3c3b6a2e910ea52213927bc05ef52;p=quix0rs-gnu-social.git

Merge branch 'nightly' of gitorious.org:social/mainline into nightly
---

1d8cc64bf0c3c3b6a2e910ea52213927bc05ef52