Merge branch 'posts' into devel
authorMarek Marecki <triviuss@gmail.com>
Fri, 29 Mar 2013 09:49:16 +0000 (10:49 +0100)
committerMarek Marecki <triviuss@gmail.com>
Fri, 29 Mar 2013 09:49:16 +0000 (10:49 +0100)
commit9fae7c88b28e58c19cc1bd8eb0025689564de797
tree83d0f0e6aa2ad6b6665180d460de24ba8282f6b9
parent313c9233b77ef40b0dd673060989924d4f96903c
parenta1a09a06037080703eb99e624064d9d31ccb6c04
Merge branch 'posts' into devel

Conflicts:
diaspy/client.py
diaspy/client.py