From: Marek Marecki Date: Wed, 3 Jul 2013 18:49:26 +0000 (+0200) Subject: Merge branch 'master' of https://github.com/Javafant/diaspora-api X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=7200b755db6142033cfac6838b18a8bd47056778;p=diaspy.git Merge branch 'master' of https://github.com/Javafant/diaspora-api --- 7200b755db6142033cfac6838b18a8bd47056778