From: Marek Marecki <marekjm@taistelu.com>
Date: Thu, 11 Jul 2013 23:33:57 +0000 (+0200)
Subject: Merge branch 'master' into settings
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=9e470d5b6b15633f26d051d5a39d4b08dc55a988;p=diaspy.git

Merge branch 'master' into settings
---

9e470d5b6b15633f26d051d5a39d4b08dc55a988
diff --cc diaspy/__init__.py
index c12c783,d62eb86..08b5fae
--- a/diaspy/__init__.py
+++ b/diaspy/__init__.py
@@@ -4,7 -4,6 +4,7 @@@ import diaspy.streams as stream
  import diaspy.client as client
  import diaspy.people as people
  import diaspy.notifications as notifications
 +import diaspy.settings as settings
  
  
- __version__ = '0.2.0'
+ __version__ = '0.3.0'