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

Trivial merge