Merge branch 'wip-MDL-39942-master' of https://github.com/kwiliarty/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 3 Feb 2014 19:28:56 +0000 (08:28 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 3 Feb 2014 19:28:56 +0000 (08:28 +1300)

Trivial merge