Merge branch 'MDL-45339-master' of git://github.com/xow/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 20 Jul 2014 22:49:25 +0000 (10:49 +1200)
committerSam Hemelryk <sam@moodle.com>
Sun, 20 Jul 2014 22:49:25 +0000 (10:49 +1200)
1  2 
lib/moodlelib.php

Simple merge