Merge branch 'master' of https://github.com/Javafant/diaspora-api into contacts
authorMarek Marecki <triviuss@gmail.com>
Sun, 30 Jun 2013 21:29:25 +0000 (23:29 +0200)
committerMarek Marecki <triviuss@gmail.com>
Sun, 30 Jun 2013 21:29:25 +0000 (23:29 +0200)
commitb23e2ccff08d326499339d8a70d93c76b8a861d0
treec904e96e4174ac6643e9c5d276dbc93549208db9
parent488d7ff6179851306dec7e3bd5516dd3bb990669
parent23fdf95caff6a563229322721a8bab3a83ff1cb1
Merge branch 'master' of https://github.com/Javafant/diaspora-api into contacts
diaspy/people.py