Merge branch 'MDL-45952_master2' of git://github.com/Syxton/moodle
authorMarina Glancy <marina@moodle.com>
Tue, 2 Sep 2014 01:58:24 +0000 (09:58 +0800)
committerMarina Glancy <marina@moodle.com>
Tue, 2 Sep 2014 01:58:24 +0000 (09:58 +0800)

Trivial merge