From: Simon L'nu <simon.lnu@gmail.com>
Date: Mon, 25 Jun 2012 22:49:46 +0000 (-0400)
Subject: Merge remote-tracking branch 'remotes/upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=f04647ca4bba6302f344bd16ba037cde89cf9ae5;p=friendica.git

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

* remotes/upstream/master:
---

f04647ca4bba6302f344bd16ba037cde89cf9ae5