Merge branch 'MDL-41667' of git://github.com/timhunt/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 16 Sep 2013 20:59:08 +0000 (08:59 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 16 Sep 2013 20:59:08 +0000 (08:59 +1200)

Trivial merge