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

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

* remotes/upstream/master:

* master:
---