From: zottel <github@zottel.net>
Date: Fri, 1 Jun 2012 06:31:38 +0000 (+0200)
Subject: Merge remote branch 'upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=08b335cac0a881b8f19793aaaebc6dacef445643;p=friendica.git

Merge remote branch 'upstream/master'
---

08b335cac0a881b8f19793aaaebc6dacef445643