Merge branch 'wip-MDL-45116_master' of https://github.com/kwiliarty/moodle
authorSam Hemelryk <sam@moodle.com>
Wed, 16 Apr 2014 20:39:34 +0000 (08:39 +1200)
committerSam Hemelryk <sam@moodle.com>
Wed, 16 Apr 2014 20:39:34 +0000 (08:39 +1200)

Trivial merge