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

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

* remotes/upstream/master:
  Existing photos could not be used as profile photos anymore - should be fixed now. And some extra logging in the CSRF-Protection to make debugging easier
  community discovery cont., cleanup of DB debugging

* master:
---

236eaf6ed09df34e62cf487712d909cb8a3b35d1