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

* remotes/upstream/master:
  diabook-themes: small-fix
  add link "remove account" to /mod/settings.php

* master: