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

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

* remotes/upstream/master:

* master:
---