Merge branch 'MDL-44804-master' of git://github.com/FMCorz/moodle
authorMarina Glancy <marina@moodle.com>
Mon, 31 Mar 2014 03:03:31 +0000 (11:03 +0800)
committerMarina Glancy <marina@moodle.com>
Mon, 31 Mar 2014 03:03:31 +0000 (11:03 +0800)

Trivial merge