From: postblue <postblue+git@postblue.info>
Date: Fri, 23 Jan 2015 11:55:54 +0000 (+0100)
Subject: Merge branch 'nightly' of gitorious.org:social/mainline into nightly
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=7996970682513ae6aa95df9c48c32a170f96eaac;p=quix0rs-gnu-social.git

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

7996970682513ae6aa95df9c48c32a170f96eaac