From: root <root@debian.(none)>
Date: Fri, 1 Jun 2012 07:10:57 +0000 (-0400)
Subject: Merge remote branch 'friendica/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=bad66a1154b3ef6ba639038218317f7ac5bf43d7;p=friendica.git

Merge remote branch 'friendica/master'
---

bad66a1154b3ef6ba639038218317f7ac5bf43d7