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

Trivial merge