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

Merge remote branch 'upstream/master'
---

17aba3033ff050a031ae578f0351db3da29ecbb7