Merge branch 'wip-MDL-28583-master' of git://github.com/marinaglancy/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 20 Nov 2012 20:15:34 +0000 (09:15 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 20 Nov 2012 20:15:34 +0000 (09:15 +1300)

Trivial merge