Merge branch 'MDL-41198-master' of https://github.com/mr-russ/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 18 Dec 2013 06:40:18 +0000 (14:40 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 18 Dec 2013 06:40:18 +0000 (14:40 +0800)
1  2 
lib/moodlelib.php

Simple merge