Merge branch 'MDL-35402_editor_rules' of git://github.com/davosmith/moodle
authorMarina Glancy <marina@moodle.com>
Thu, 24 Oct 2013 04:29:15 +0000 (15:29 +1100)
committerMarina Glancy <marina@moodle.com>
Thu, 24 Oct 2013 04:29:15 +0000 (15:29 +1100)

Trivial merge