From: Simon L'nu <simon.lnu@gmail.com>
Date: Mon, 14 May 2012 23:29:06 +0000 (-0400)
Subject: Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=2687f4377c301205afbbcf2034cbb1b9556e08e7;p=friendica.git

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

* remotes/upstream/master:

* master:
---