From: Michael <ike@pirati.ca>
Date: Sat, 3 Nov 2012 21:27:34 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=2b6498b2a25dff4e89501a634b5d58418d922ebd;p=friendica.git

Merge remote-tracking branch 'upstream/master'
---

2b6498b2a25dff4e89501a634b5d58418d922ebd