Merge branch 'MDL-38555-master' of https://github.com/lucisgit/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 11 Jun 2013 23:36:40 +0000 (11:36 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 11 Jun 2013 23:36:40 +0000 (11:36 +1200)
1  2 
lib/formslib.php

Simple merge