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

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

* remotes/upstream/master:

* master:
---

e21bf3341b89363207271d42e2d1163639b06d12