Merge branch 'wip-MDL-46247-master' of https://github.com/mackensen/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 13 Jul 2014 23:55:02 +0000 (11:55 +1200)
committerSam Hemelryk <sam@moodle.com>
Sun, 13 Jul 2014 23:55:02 +0000 (11:55 +1200)
1  2 
lib/moodlelib.php

Simple merge