From: Marek Marecki <triviuss@gmail.com>
Date: Fri, 24 May 2013 20:20:32 +0000 (+0200)
Subject: Merge branch 'users'
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=b05a99b86f3ac5235f8ecbf308bee787d8c026b4;p=diaspy.git

Merge branch 'users'
---

b05a99b86f3ac5235f8ecbf308bee787d8c026b4