Merge branch 'wip-MDL-40356-master' of git://github.com/abgreeve/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 22 Sep 2014 14:02:51 +0000 (15:02 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 22 Sep 2014 14:02:51 +0000 (15:02 +0100)
1  2 
lib/moodlelib.php

Simple merge