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

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

* remotes/upstream/master:
  profile redir - goto correct profile page even if contact blocked, you just can't do anything.

* master:
---

75c7877986c118703839309268af14658c85f9b3