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)
1  2 
lib/form/editor.php

Simple merge