From: zottel <github@zottel.net>
Date: Thu, 31 May 2012 06:43:14 +0000 (+0200)
Subject: Merge remote branch 'upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=20fdbda25e7fa1c1f6e234867df495be1085f3f8;p=friendica.git

Merge remote branch 'upstream/master'
---

20fdbda25e7fa1c1f6e234867df495be1085f3f8