From: Thomas Willingham <founder@kakste.com>
Date: Sun, 4 Nov 2012 19:56:33 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=234598280d96627861a1ff1dcfc8a4a59bd37054;p=friendica.git

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

234598280d96627861a1ff1dcfc8a4a59bd37054