Merge branch 'fix_social' of gnunet.org:gnunet into fix_social
authort3sserakt <t3ss@posteo.de>
Tue, 21 Nov 2017 03:38:25 +0000 (04:38 +0100)
committert3sserakt <t3ss@posteo.de>
Tue, 21 Nov 2017 03:38:25 +0000 (04:38 +0100)

Trivial merge