From dbbcddf84527c7df95909c5dad2d03b26262efbc Mon Sep 17 00:00:00 2001
From: Simon L'nu <simon.lnu@gmail.com>
Date: Mon, 7 May 2012 04:40:54 -0400
Subject: [PATCH] Merge branch 'master', remote-tracking branch
 'remotes/upstream/master'

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

* master: