Merge remote-tracking branch 'origin/master' into identity_oidc
[oweals/gnunet.git] / .mailmap
2018-01-08 Schanzenbach, MartinMerge remote-tracking branch 'origin/master' into ident...
2018-01-06 lurchiMerge branch 'lurchi_social'
2018-01-04 ng0Merge branch 'master' of gnunet.org:gnunet
2018-01-04 ng0introduce .mailmap