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

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

* remotes/upstream/master:

* master:
---