Merge branch 'MDL-45478-master' of git://github.com/sammarshallou/moodle
authorMarina Glancy <marina@moodle.com>
Mon, 19 May 2014 09:29:27 +0000 (17:29 +0800)
committerMarina Glancy <marina@moodle.com>
Mon, 19 May 2014 09:29:27 +0000 (17:29 +0800)

Trivial merge