Merge branch 'master' into search
authorMarek Marecki <triviuss@gmail.com>
Sun, 7 Jul 2013 16:09:56 +0000 (18:09 +0200)
committerMarek Marecki <triviuss@gmail.com>
Sun, 7 Jul 2013 16:09:56 +0000 (18:09 +0200)
commit1530cc843b825cd800064c6186c65e6b5d17e4b9
treea29014745139853ac794d7330c3faa968fa30dfe
parent7c6fbe5b6cff3ddf1f3120fcda37fcc70675cdc5
parent9aa1c9608f928dccf66cec272ed26d7ee003deac
Merge branch 'master' into search

Conflicts:
diaspy/errors.py
diaspy/people.py
diaspy/connection.py
diaspy/errors.py
diaspy/people.py
diaspy/streams.py