From: Simon L'nu <simon.lnu@gmail.com>
Date: Thu, 19 Apr 2012 17:02:52 +0000 (-0400)
Subject: Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=6055d636ed878c86294f1b9d5ef6ad7fd99cef7e;p=friendica.git

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

* remotes/upstream/master:

* master:
---

6055d636ed878c86294f1b9d5ef6ad7fd99cef7e