From: zottel <github@zottel.net>
Date: Fri, 27 Apr 2012 21:05:38 +0000 (+0200)
Subject: Merge remote branch 'upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=edc7e571b710d0ce24587c529d6e51ee7781d638;p=friendica.git

Merge remote branch 'upstream/master'
---

edc7e571b710d0ce24587c529d6e51ee7781d638