From: Simon L'nu <simon.lnu@gmail.com>
Date: Sun, 22 Apr 2012 05:17:13 +0000 (-0400)
Subject: Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=f99d9e4d7f89ed0edb03ff07bad7c087154fc6ad;p=friendica.git

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

* remotes/upstream/master:
  rev update
  diabook-themes: deleted obsolete diabook-folder & minor bug-fixes

* master:
---

f99d9e4d7f89ed0edb03ff07bad7c087154fc6ad