From: Simon L'nu <simon.lnu@gmail.com>
Date: Sat, 14 Apr 2012 00:13:30 +0000 (-0400)
Subject: Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=13930e9a8004aafda4a2aede69fafe5b597a6d60;p=friendica.git

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

* remotes/upstream/master:

* master:
---