Merge branch 'MDL-52471-master' of git://github.com/danpoltawski/moodle
authorDavid Monllao <davidm@moodle.com>
Fri, 11 Dec 2015 03:52:02 +0000 (11:52 +0800)
committerDavid Monllao <davidm@moodle.com>
Fri, 11 Dec 2015 03:52:02 +0000 (11:52 +0800)
1  2 
lib/setuplib.php

Simple merge