From: Sergey Matveev <stargrave@stargrave.org>
Date: Sun, 18 Feb 2018 16:15:59 +0000 (+0300)
Subject: Merge branch 'develop'
X-Git-Tag: 3.0
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=d0320fd0ada4fe11465f5f391fed6bc3df6f4d14;p=nncp.git

Merge branch 'develop'
---

b711e2e5767124b1d12fd548ad9605d77c0edbb6