Merge branch 'MDL-41792_master' of https://github.com/markn86/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 8 Oct 2013 08:03:46 +0000 (16:03 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 8 Oct 2013 08:03:46 +0000 (16:03 +0800)
1  2 
lib/moodlelib.php

Simple merge