From: zottel <github@zottel.net>
Date: Fri, 25 May 2012 19:05:42 +0000 (+0200)
Subject: Merge remote branch 'upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=36d6018c110fca190b720c5ff27883c2d4ed70c3;p=friendica.git

Merge remote branch 'upstream/master'
---

36d6018c110fca190b720c5ff27883c2d4ed70c3