From: Marek Marecki Date: Sun, 30 Jun 2013 21:29:25 +0000 (+0200) Subject: Merge branch 'master' of https://github.com/Javafant/diaspora-api into contacts X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=b23e2ccff08d326499339d8a70d93c76b8a861d0;p=diaspy.git Merge branch 'master' of https://github.com/Javafant/diaspora-api into contacts --- b23e2ccff08d326499339d8a70d93c76b8a861d0