From 74b237d46d9472a125315e35d77bf2d0fdabaa7e Mon Sep 17 00:00:00 2001
From: Simon L'nu <simon.lnu@gmail.com>
Date: Tue, 17 Apr 2012 15:36:45 -0400
Subject: [PATCH] Merge branch 'master', remote-tracking branch
 'remotes/upstream/master'

* remotes/upstream/master:
  diabook-themes: theme-settings: "wide"-option and new screenshots

* master: