From: lurchi <lurchi@strangeplace.net>
Date: Fri, 13 Oct 2017 20:18:43 +0000 (+0200)
Subject: Merge branch 'fix_social' of ssh://gnunet.org/gnunet into fix_social
X-Git-Tag: gnunet-0.11.0rc0~48^2~1^2~44
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=2af1f1b81cefe8307c702f304451ae67c0fa1437;p=oweals%2Fgnunet.git

Merge branch 'fix_social' of ssh://gnunet.org/gnunet into fix_social
---

2af1f1b81cefe8307c702f304451ae67c0fa1437