Merge branch 'MDL-46281-master' of git://github.com/lucisgit/moodle
authorMarina Glancy <marina@moodle.com>
Tue, 19 Aug 2014 08:26:35 +0000 (16:26 +0800)
committerMarina Glancy <marina@moodle.com>
Tue, 19 Aug 2014 08:26:35 +0000 (16:26 +0800)

Trivial merge