Merge branch 'w01_MDL-43528_m27_magic' of https://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 6 Jan 2014 01:19:11 +0000 (14:19 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 6 Jan 2014 01:19:11 +0000 (14:19 +1300)

Trivial merge