Merge branch 'wip-MDL-42098-master' of git://github.com/abgreeve/moodle
authorDamyon Wiese <damyon@moodle.com>
Wed, 9 Oct 2013 03:48:14 +0000 (11:48 +0800)
committerDamyon Wiese <damyon@moodle.com>
Wed, 9 Oct 2013 03:48:14 +0000 (11:48 +0800)
1  2 
lib/moodlelib.php

Simple merge