From: Marek Marecki <marekjm@ozro.pw>
Date: Tue, 5 May 2015 21:02:53 +0000 (+0200)
Subject: Merge branch 'devel'
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=0c9a23b6b86fc4231aec35166b70d536ec23a21f;p=diaspy.git

Merge branch 'devel'
---

0c9a23b6b86fc4231aec35166b70d536ec23a21f