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