From: Damyon Wiese <damyon@moodle.com>
Date: Tue, 16 Jul 2013 13:23:30 +0000 (+0800)
Subject: Merge branch 'w29_MDL-40574_m26_editordelete' of https://github.com/skodak/moodle
X-Git-Tag: v2.6.0-beta~959
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=59e649180d5649fb277ea54171725d563b7a2594

Merge branch 'w29_MDL-40574_m26_editordelete' of https://github.com/skodak/moodle
---

59e649180d5649fb277ea54171725d563b7a2594