Merge branch 'w51_MDL-42931_m27_env27' of https://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 15 Dec 2013 22:18:02 +0000 (11:18 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 15 Dec 2013 22:18:02 +0000 (11:18 +1300)

Trivial merge