From a3b2f35c84c2f31a31e5730a68f9fe6a9c01dd73 Mon Sep 17 00:00:00 2001
From: Simon L'nu <simon.lnu@gmail.com>
Date: Thu, 12 Apr 2012 01:03:54 -0400
Subject: [PATCH] Merge branch 'master', remote-tracking branch
 'remotes/upstream/master'

* remotes/upstream/master:
  diabook-themes: small fix

* master: