From: vinzv <vinz@vinzv.de>
Date: Fri, 2 Sep 2016 09:32:49 +0000 (+0200)
Subject: Merge branch 'nightly' of https://git.gnu.io/gnu/gnu-social into nightly
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=845a0f8e2da0424b665d12858a80e955ed5c32ec;p=quix0rs-gnu-social.git

Merge branch 'nightly' of https://git.gnu.io/gnu/gnu-social into nightly

Conflicts:
	lib/util.php
---

845a0f8e2da0424b665d12858a80e955ed5c32ec