Merge branch 'm20_MDL-25671_data_template_editor' of git://github.com/dongsheng/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 7 Feb 2011 05:50:36 +0000 (13:50 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 7 Feb 2011 05:50:36 +0000 (13:50 +0800)

Trivial merge