Merge branch 'MDL-43093' of git://github.com/timhunt/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 3 Dec 2013 21:12:12 +0000 (10:12 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 3 Dec 2013 21:12:12 +0000 (10:12 +1300)
1  2 
lib/formslib.php

Simple merge