From: Thomas Willingham <founder@kakste.com>
Date: Tue, 24 Apr 2012 03:54:14 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=92820c51811f80634c3e235c0ca67deea823d2d9;p=friendica.git

Merge remote-tracking branch 'upstream/master'

Merge upstream
---

92820c51811f80634c3e235c0ca67deea823d2d9