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

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

* remotes/upstream/master:
  add "find friends" to right_aside to diabook, fixes in css in diabook
  fixed Umlaute in de strings.php

* master:
---

a57e1e9cbcb492df05580e8cc492fe757f8df73b