From: zottel <github@zottel.net>
Date: Wed, 23 May 2012 16:25:58 +0000 (+0200)
Subject: Merge remote branch 'upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=3aa516ccabc9bb09ae30ffa2d3657fba36699ea9;p=friendica.git

Merge remote branch 'upstream/master'
---

3aa516ccabc9bb09ae30ffa2d3657fba36699ea9