Merge branch 'w02_MDL-43529_m27_globals' of https://github.com/skodak/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 14 Jan 2014 06:46:55 +0000 (14:46 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 14 Jan 2014 06:46:55 +0000 (14:46 +0800)

Trivial merge