Merge branch 'MDL-40909_master' of https://github.com/markn86/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 28 Jan 2014 19:23:51 +0000 (08:23 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 28 Jan 2014 19:23:51 +0000 (08:23 +1300)

Trivial merge