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)
commitc7944a72b39e29046058125a77d2a1ef2c165cfc
tree4156fa994947b2f0e2873d715119b61964f12ea3
parent33c4c3a3633ce37f2ba9e0f5394def52251e1a94
parentd79d07175eb5481fe227e863584e2e77c747998c
Merge branch 'MDL-35402_editor_rules' of git://github.com/davosmith/moodle