Merge branch 'MDL-52451-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 14 Dec 2015 10:46:29 +0000 (10:46 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 14 Dec 2015 10:46:29 +0000 (10:46 +0000)
1  2 
lib/formslib.php

Simple merge