Merge branch 'people' into streams
authorMarek Marecki <triviuss@gmail.com>
Tue, 7 May 2013 21:40:45 +0000 (23:40 +0200)
committerMarek Marecki <triviuss@gmail.com>
Tue, 7 May 2013 21:40:45 +0000 (23:40 +0200)
commit33a45682451bbdfe9bd4d0c7e8b0c93edf3b306b
treefb37275560823ba96cd4865350328ce8aa349e3e
parent66c3bb7661a5d1737d67476a26f1ca7b5b84a127
parent9dc5805a8561163a22bf4636de6d95a93cce6be5
Merge branch 'people' into streams

Conflicts:
tests.py
diaspy/people.py
tests.py