Merge branch 'wip-MDL-43279-master' of git://github.com/marinaglancy/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 10 Dec 2013 21:59:21 +0000 (10:59 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 10 Dec 2013 21:59:21 +0000 (10:59 +1300)

Trivial merge