Merge branch 'fladrian-patch-for-d-0.2.0.0' into devel
authorMarek Marecki <marekjm@taistelu.com>
Mon, 2 Sep 2013 15:36:56 +0000 (17:36 +0200)
committerMarek Marecki <marekjm@taistelu.com>
Mon, 2 Sep 2013 15:36:56 +0000 (17:36 +0200)
commit73a9e0d35ee7f3af1e26ad43dad0c03258de7a85
tree171c60dd966d9f59feb9b14c44b7a8e7800336c9
parent5de528034c6979fdbce9a4fe175a13ca33c32d1e
parent2b6b487e7f0b111d4b89ce7249087bbf70ea7c01
Merge branch 'fladrian-patch-for-d-0.2.0.0' into devel

Conflicts:
diaspy/connection.py
Changelog.markdown
diaspy/__init__.py
diaspy/connection.py
diaspy/people.py
diaspy/streams.py
tests.py