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

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

* remotes/upstream/master:
  reset permissions to forum default when adding forum delivery chain

* master:
---