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

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

* remotes/upstream/master:
  diabook-themes: add diabook-dark
  diabook-themes: add diabook-green and some minor css/bug-fixes
  rev update
  escape email template var names. fix bug n385.

* master:
---