From: Christian Grothoff <christian@grothoff.org>
Date: Wed, 15 Mar 2017 09:17:06 +0000 (+0100)
Subject: Merge branch 'getopt' of git+ssh://gnunet.org/gnunet into getopt
X-Git-Tag: gnunet-0.11.0rc0~280^2~3^2~14^2~12^2~3
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f1cef840e1745246010b5f83de14246e491cb9b3;p=oweals%2Fgnunet.git

Merge branch 'getopt' of git+ssh://gnunet.org/gnunet into getopt
---

f1cef840e1745246010b5f83de14246e491cb9b3