Merge branch 'master' into session-refactoring
authorMarek Marecki <triviuss@gmail.com>
Sat, 30 Mar 2013 13:06:13 +0000 (14:06 +0100)
committerMarek Marecki <triviuss@gmail.com>
Sat, 30 Mar 2013 13:06:13 +0000 (14:06 +0100)
commit65b91311307a92bd76d9b1fd59d209f4f16d9d24
tree3010ae20325256c298c96087d7a560c7e17bb5b9
parent88ec6cdaaca6f58767df471614ee55e7b398d801
parent9088535d66192a4dd28405a16bad3a5c0214c570
Merge branch 'master' into session-refactoring

Conflicts:
diaspy/client.py
diaspy/conversations.py
diaspy/models.py
tests.py
diaspy/client.py
diaspy/conversations.py
diaspy/models.py
tests.py