From: Sergey Matveev <stargrave@stargrave.org>
Date: Sat, 30 Dec 2017 09:31:19 +0000 (+0300)
Subject: Merge branch 'develop'
X-Git-Tag: 2.0
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=19d89057778d5f0e73f8f9d78dee08a98e6d214a;p=nncp.git

Merge branch 'develop'
---

a22b47561276b9acdd4efe969ac8f8ace9b0b9b8