From: Marek Marecki <marekjm@ozro.pw>
Date: Sun, 23 Apr 2017 12:27:38 +0000 (+0200)
Subject: Merge branch 'cnngimenez-master'
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=72a1545571c58ada85f4c6f2589035a157deea60;p=diaspy.git

Merge branch 'cnngimenez-master'
---

72a1545571c58ada85f4c6f2589035a157deea60