From: zottel <github@zottel.net>
Date: Wed, 25 Apr 2012 07:07:36 +0000 (+0200)
Subject: Merge remote branch 'upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=0116426a0eccc81382a670989032b0a095a65a20;p=friendica.git

Merge remote branch 'upstream/master'
---

0116426a0eccc81382a670989032b0a095a65a20