Merge branch 'MDL-46210-master' of git://github.com/danpoltawski/moodle
authorMarina Glancy <marina@moodle.com>
Mon, 6 Oct 2014 12:39:09 +0000 (20:39 +0800)
committerMarina Glancy <marina@moodle.com>
Mon, 6 Oct 2014 12:39:09 +0000 (20:39 +0800)

Trivial merge