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

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

* remotes/upstream/master:
  rev update

* master:
---