Merge branch 'MDL-46918' of git://github.com/timhunt/moodle
authorMarina Glancy <marina@moodle.com>
Mon, 25 Aug 2014 04:01:10 +0000 (12:01 +0800)
committerMarina Glancy <marina@moodle.com>
Mon, 25 Aug 2014 04:01:10 +0000 (12:01 +0800)

Trivial merge