Merge branch 'wip_MDL-46099_m28_userglobal' of https://github.com/skodak/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 1 Jul 2014 09:39:14 +0000 (10:39 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 1 Jul 2014 09:39:14 +0000 (10:39 +0100)

Trivial merge