Merge branch 'aspects-add-fix' of https://github.com/jaywink/diaspora-api into contacts
authorMarek Marecki <triviuss@gmail.com>
Sun, 30 Jun 2013 22:58:26 +0000 (00:58 +0200)
committerMarek Marecki <triviuss@gmail.com>
Sun, 30 Jun 2013 22:58:26 +0000 (00:58 +0200)
commitfd94d58c6fbbf6492be9888d6b3b477d60f1defa
treebdb0d31028f83a81d72d557e11a9f4fd46a4db02
parent1513c0d9c6e875584b45a8cd1dcdb0e73edfdf62
parent0d698df14f27fb9f8d5a40361e2ca574e5b37870
Merge branch 'aspects-add-fix' of https://github.com/jaywink/diaspora-api into contacts
diaspy/models.py
diaspy/people.py