From: Simon L'nu <simon.lnu@gmail.com>
Date: Fri, 27 Apr 2012 00:07:54 +0000 (-0400)
Subject: Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=7b5bab445de31f52504454754c3c12410537fcfd;p=friendica.git

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:
---