From: Simon L'nu <simon.lnu@gmail.com>
Date: Wed, 7 Mar 2012 02:33:56 +0000 (-0500)
Subject: Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=edfa7dbac2ff8ed054fce90cba40efcca6c85529;p=friendica.git

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

* remotes/upstream/master:
  fix photos after permissions_sql change
  [privacy] rework latest fix
  remove stray debugging

* master:
---

edfa7dbac2ff8ed054fce90cba40efcca6c85529