From: Marek Marecki <marekjm@taistelu.com>
Date: Thu, 22 Aug 2013 14:19:07 +0000 (+0200)
Subject: Merge branch 'settings' into asacat
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=e3cd70a3158788b41c4ed5558b6172345189466b;p=diaspy.git

Merge branch 'settings' into asacat
---

e3cd70a3158788b41c4ed5558b6172345189466b