From: Christian Grothoff Date: Tue, 14 Aug 2018 09:17:30 +0000 (+0200) Subject: resolve merge conflict with peerinfo plugin move X-Git-Tag: v0.11.0~309 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=5bb2565bab0b8fa8cac263b9fb70edf3ae2278d9;p=oweals%2Fgnunet.git resolve merge conflict with peerinfo plugin move --- 5bb2565bab0b8fa8cac263b9fb70edf3ae2278d9