Merge branch 'wip-MDL-48366-master' of git://github.com/marinaglancy/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 9 Dec 2014 00:43:30 +0000 (13:43 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 9 Dec 2014 00:43:30 +0000 (13:43 +1300)

Trivial merge