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)
commite8d6d2472978bab564831a6ca62e480432648742
treea12536fef651e9f44dcbc53b13404c489c7b2e56
parented4801f4f0ee0d59dd84cd3e18636686a6b300e7
parent08a7fbb0271488e19146c9e50228e89964b17469
Merge branch 'm20_MDL-25671_data_template_editor' of git://github.com/dongsheng/moodle