From 75c228fa13d814c772db4e072dfc615eed29d206 Mon Sep 17 00:00:00 2001
From: Simon L'nu <simon.lnu@gmail.com>
Date: Sun, 22 Apr 2012 12:27:59 -0400
Subject: [PATCH] Merge branch 'master', remote-tracking branch
 'remotes/upstream/master'

* remotes/upstream/master:
  DE strings update
  diabook-themes: comment-bbcode-bugfix

* master: