Merge branch 'master' of https://github.com/Javafant/diaspora-api
authorMarek Marecki <triviuss@gmail.com>
Wed, 3 Jul 2013 18:49:26 +0000 (20:49 +0200)
committerMarek Marecki <triviuss@gmail.com>
Wed, 3 Jul 2013 18:49:26 +0000 (20:49 +0200)
commit7200b755db6142033cfac6838b18a8bd47056778
tree9ee457f9574bc674817b907ac8346afbbf124089
parent08f03d2621d69d66f18a7f5616ddd4b9dbf91e88
parent7f404fd854ca00c206c3a898635787ed6b6645d5
Merge branch 'master' of https://github.com/Javafant/diaspora-api
diaspy/models.py