From: Marek Marecki <triviuss@gmail.com>
Date: Fri, 5 Jul 2013 23:13:14 +0000 (+0200)
Subject: Merge branch 'users'
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=0f136127b1b66e601277e4f55d7cdab0fb82a07f;p=diaspy.git

Merge branch 'users'
---

0f136127b1b66e601277e4f55d7cdab0fb82a07f