Merge branch 'fix_social' of ssh://gnunet.org/gnunet into fix_social
authorlurchi <lurchi@strangeplace.net>
Fri, 13 Oct 2017 20:18:43 +0000 (22:18 +0200)
committerlurchi <lurchi@strangeplace.net>
Fri, 13 Oct 2017 20:19:17 +0000 (22:19 +0200)
commit2af1f1b81cefe8307c702f304451ae67c0fa1437
tree8661b354873946a23c69ac5ed7c210b87a6eca60
parent7ca96c1ceb078bcee0da73217b7019c1329939eb
parentb829c58174f5ac332810436d7b43ff90a92b8426
Merge branch 'fix_social' of ssh://gnunet.org/gnunet into fix_social