From: fermionic <fermion@gmx.com>
Date: Sun, 10 Mar 2013 22:24:27 +0000 (-0700)
Subject: Merge pull request #646 from annando/master
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=91a6a1cb2501fdaf9a5ed792b70cf08c2b41591f;p=friendica.git

Merge pull request #646 from annando/master

OStatus conversations, "vier" and diaspora android client
---

91a6a1cb2501fdaf9a5ed792b70cf08c2b41591f