Merge branch 'MDL-47808-master' of git://github.com/andrewnicols/moodle
authorMarina Glancy <marina@moodle.com>
Thu, 23 Oct 2014 09:16:44 +0000 (17:16 +0800)
committerMarina Glancy <marina@moodle.com>
Thu, 23 Oct 2014 09:16:44 +0000 (17:16 +0800)

Trivial merge