Merge branch 'MDL-39978' of git://github.com/timhunt/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 10 Jun 2013 02:48:21 +0000 (14:48 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 10 Jun 2013 02:48:21 +0000 (14:48 +1200)

Trivial merge