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)
commit59e649180d5649fb277ea54171725d563b7a2594
tree6b0ba3b09b808a031218a83ef17eaea1e32e765e
parente202521f2534684275ac50b22a6ccf8fa293b809
parent485392f308ca88b6dd56ea84d06f7e4ead47b18f
Merge branch 'w29_MDL-40574_m26_editordelete' of https://github.com/skodak/moodle