Merge branch 'master_MDL-38102' of github.com:totara/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 7 May 2013 15:06:09 +0000 (23:06 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 7 May 2013 15:06:09 +0000 (23:06 +0800)
1  2 
lib/moodlelib.php

Simple merge