From: Marek Marecki Date: Sat, 24 Aug 2013 13:23:01 +0000 (+0200) Subject: Merge branch 'master' into settings X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=b4da66ad9d2f0a5182b173c1d81e8c6e36925c08;p=diaspy.git Merge branch 'master' into settings --- b4da66ad9d2f0a5182b173c1d81e8c6e36925c08