Merge branch 'MDL-46986-master' of git://github.com/lameze/moodle
authorMarina Glancy <marina@moodle.com>
Fri, 7 Nov 2014 03:54:13 +0000 (11:54 +0800)
committerMarina Glancy <marina@moodle.com>
Fri, 7 Nov 2014 03:54:13 +0000 (11:54 +0800)

Trivial merge