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

Merge remote-tracking branch 'upstream/master'

Merge upstream
---

8a80ea24d1d8039be6dc532c9db23c60e71eb467