From: Marek Marecki <triviuss@gmail.com>
Date: Sun, 7 Jul 2013 16:16:42 +0000 (+0200)
Subject: Merge branch 'master' into search
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=990306f31f4cb3c3dbee5cbb80820c6a4d556d74;p=diaspy.git

Merge branch 'master' into search
---

990306f31f4cb3c3dbee5cbb80820c6a4d556d74