From: zottel <github@zottel.net>
Date: Tue, 6 Dec 2011 08:02:29 +0000 (-0800)
Subject: Merge remote branch 'upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=cd3a02ab8e5aa2dc56ba3939e5d480e4966b11aa;p=friendica.git

Merge remote branch 'upstream/master'
---

cd3a02ab8e5aa2dc56ba3939e5d480e4966b11aa