Merge branch 'MDL-40633' of git://github.com/timhunt/moodle
authorMarina Glancy <marina@moodle.com>
Mon, 15 Jul 2013 04:41:55 +0000 (14:41 +1000)
committerMarina Glancy <marina@moodle.com>
Mon, 15 Jul 2013 04:41:55 +0000 (14:41 +1000)

Trivial merge