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

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

* remotes/upstream/master:
  ignore removed plugins
  fix messed up config tables w/ duplicate entries
  small fixes for the German strings
  fix bad sql update
  revert config changes, we're getting duplicate keys
  new-contacts-introductions in contacts-drop-down and new-messages in messages-drop-down get each an additional indicator... profile-picture is now scaled right in firefox... fixed broken css on introductions-page in firefox...

* master:
---

bc69a957dc875b699240827cb4af2691f8a8fcd6