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

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

* remotes/upstream/master:
  rev update

* master:
---

fcf6d10efd72f523879b8354e065ad4297e5434f