Merge branch 'w29_MDL-40574_m26_editordelete' of https://github.com/skodak/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 16 Jul 2013 13:23:30 +0000 (21:23 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 16 Jul 2013 13:23:30 +0000 (21:23 +0800)

Trivial merge