From: postblue <postblue+git@postblue.info>
Date: Sat, 7 Mar 2015 23:35:02 +0000 (+0100)
Subject: Merge branch 'nightly' of gitorious.org:social/mainline into nightly
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=refs%2Fheads%2Fpostblue-nightly;p=quix0rs-gnu-social.git

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

67c6094e0bb90ca3c1ff42402c5a50a914c13d6d