Merge branch 'MDL-52978_master' of git://github.com/markn86/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 Mar 2016 22:07:16 +0000 (23:07 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 Mar 2016 22:07:16 +0000 (23:07 +0100)
1  2 
lib/formslib.php

Simple merge