From: fabrixxm <fabrix.xm@gmail.com>
Date: Tue, 5 Jul 2011 05:11:57 +0000 (+0200)
Subject: Merge branch 'dispy' of github.com:fabrixxm/friendika into dispy
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=4e7a5dc56ebb8d99ed06b0b303c4ee24460ae6a8;p=friendica.git

Merge branch 'dispy' of github.com:fabrixxm/friendika into dispy
---

4e7a5dc56ebb8d99ed06b0b303c4ee24460ae6a8