From: Simon L'nu <simon.lnu@gmail.com>
Date: Thu, 10 May 2012 06:16:49 +0000 (-0400)
Subject: Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=25d5eae9557527789b7237724b66fa88f9c44d6d;p=friendica.git

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

* remotes/upstream/master:
  rev update
  rev update

* master:
---

25d5eae9557527789b7237724b66fa88f9c44d6d