From: Simon L'nu <simon.lnu@gmail.com>
Date: Mon, 5 Mar 2012 17:23:16 +0000 (-0500)
Subject: Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=e05313f88f1b61c4d5e21230f58e53f654c88605;p=friendica.git

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

* remotes/upstream/master:

* master:
---