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

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

* remotes/upstream/master:

* master:
---

1aa23674691bff1e0f61ae923e3ab045b6330d22