Merge branch 'MDL-52226-master' of git://github.com/sammarshallou/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 21 Dec 2015 06:41:21 +0000 (14:41 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 21 Dec 2015 06:41:21 +0000 (14:41 +0800)
1  2 
lib/setuplib.php

Simple merge