Merge branch 'wip-MDL-37011' of git://github.com/abgreeve/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 10 Dec 2012 19:42:40 +0000 (08:42 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 10 Dec 2012 19:42:40 +0000 (08:42 +1300)

Trivial merge