Merge branch 'wip-MDL-37206-master' of git://github.com/marinaglancy/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 14 Jan 2013 21:48:53 +0000 (10:48 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 14 Jan 2013 21:48:53 +0000 (10:48 +1300)

Trivial merge