[gnunet] branch master updated (8547143da -> f3d66d0dc)

[gnunet]

This is an automated email from the git hooks/post-receive script.

ng0 pushed a change to branch master
in repository gnunet.

    from 8547143da adapt code to work with latest MHD API
     new 22119c687 fix interpreter line of gnunet-bugreport
     new f3d66d0dc mailmap adjust

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .mailmap                         | 15 ++++++++-------
 contrib/scripts/gnunet-bugreport |  2 +-
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/.mailmap b/.mailmap
index a468dd48d..e15a72268 100644
--- a/.mailmap
+++ b/.mailmap
@@ -14,13 +14,14 @@ Jeffrey Burdges <address@hidden>
 Martin Schanzenbach <address@hidden> Schanzenbach, Martin <address@hidden>
 Martin Schanzenbach <address@hidden> Schanzenbach, Martin <address@hidden>
 Martin Schanzenbach <address@hidden> Martin Schanzenbach <address@hidden>
-address@hidden <address@hidden>
-ng0 <address@hidden> ng0 <address@hidden>
-ng0 <address@hidden> ng0 <address@hidden>
-ng0 <address@hidden> ng0 <address@hidden>
-ng0 <address@hidden> N. 'ng0' Gillmann <address@hidden>
-ng0 <address@hidden> ng0 <address@hidden>
-ng0 <address@hidden> Nils Gillmann <address@hidden>
+nikita <address@hidden> address@hidden <address@hidden>
+nikita <address@hidden> ng0 <address@hidden>
+nikita <address@hidden>
+nikita <address@hidden> ng0 <address@hidden>
+nikita <address@hidden> ng0 <address@hidden>
+nikita <address@hidden>  N. 'ng0' Gillmann <address@hidden>
+nikita <address@hidden> ng0 <address@hidden>
+nikita <address@hidden>  Nils Gillmann <address@hidden>
 t3sserakt <address@hidden>
 t3sserakt <address@hidden> <address@hidden>
 tg(x) <*@tg-x.net>
diff --git a/contrib/scripts/gnunet-bugreport b/contrib/scripts/gnunet-bugreport
index 21808273a..4c12313df 100755
--- a/contrib/scripts/gnunet-bugreport
+++ b/contrib/scripts/gnunet-bugreport
@@ -1,4 +1,4 @@
-#!/usr/bin/env sh
+#!/bin/sh
 #
 # Caveats:
 # - checks with textprocessing assuming that system language is English.

-- 
To stop receiving notification emails like this one, please contact
address@hidden.