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)
commitbd75ef826eb4fbcaacb80db8dcd91a2eac2daf28
tree33c10e3ba2329ad71669151f0892161e4dd83766
parent96ab0104eab270389d022c740b3278981d6ac66f
parentb3d5f7bc50eb72baaa5d05b2047e9ac9244ebf69
Merge branch 'wip-MDL-40356-master' of git://github.com/abgreeve/moodle
lib/moodlelib.php