Merge branch 'MDL-45629_master' of git://github.com/markn86/moodle
authorMarina Glancy <marina@moodle.com>
Mon, 26 May 2014 03:58:50 +0000 (11:58 +0800)
committerMarina Glancy <marina@moodle.com>
Mon, 26 May 2014 03:58:50 +0000 (11:58 +0800)

Trivial merge