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

Trivial merge