Merge branch 'MDL-44701' of git://github.com/aolley/moodle
authorMarina Glancy <marina@moodle.com>
Tue, 1 Apr 2014 03:06:23 +0000 (11:06 +0800)
committerMarina Glancy <marina@moodle.com>
Tue, 1 Apr 2014 03:06:23 +0000 (11:06 +0800)

Trivial merge