Merge branch 'wip-mdl-34508' of git://github.com/rajeshtaneja/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 10 Jun 2013 22:29:11 +0000 (10:29 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 10 Jun 2013 22:29:11 +0000 (10:29 +1200)
commitbd7004d51c1e96dacfa6043941d70bb136ed86cd
treeab35afcb68866e7d8b0a1369183be4d43ececfe1
parent50b5ae4a8d8cbb230422fcbb3c669157d223a895
parentafec2544675f7269bf61baf454d37e2793a89344
Merge branch 'wip-mdl-34508' of git://github.com/rajeshtaneja/moodle
lib/form/editor.php