From: Sergey Matveev <stargrave@stargrave.org>
Date: Thu, 19 Jan 2017 20:37:10 +0000 (+0300)
Subject: Merge branch 'develop'
X-Git-Tag: 0.4^0
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=8c96237da230cf7306d2cc460164879d6d1bbce4;p=nncp.git

Merge branch 'develop'
---

8c96237da230cf7306d2cc460164879d6d1bbce4