Merge branch 'master' into search
authorMarek Marecki <triviuss@gmail.com>
Sun, 7 Jul 2013 16:16:42 +0000 (18:16 +0200)
committerMarek Marecki <triviuss@gmail.com>
Sun, 7 Jul 2013 16:16:42 +0000 (18:16 +0200)
commit990306f31f4cb3c3dbee5cbb80820c6a4d556d74
treee02578c91c0f236de420e3069804b07180961c30
parent1530cc843b825cd800064c6186c65e6b5d17e4b9
parentec27a0a111093a80949d43dbeaf51c7e8675f48b
Merge branch 'master' into search
diaspy/people.py