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

Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

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

* master:
---