From 172aff1c2bb52f07e107bff2abbeea40a12aa5ae Mon Sep 17 00:00:00 2001
From: Simon L'nu <simon.lnu@gmail.com>
Date: Fri, 20 Apr 2012 20:16:06 -0400
Subject: [PATCH] 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: