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

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

* remotes/upstream/master:
  DE strings, correction of a typo
  diabok-themes: fixed bug in green-wide and dark-wide
  diabook-themes: small fix in nets_aside, group_aside and delete obsolete .tpls in subfolders
  diabook-themes: bugfix in admin-section
  allow bbcode representation of html symbols such as &copy; by wrapping in bb brackets
  protect jappixmini/proxy from typo check, more work on email2 connector

* master:
---

6e9485605f64394f8e6d830b8a959a5afc85cf2d