Merge branch 'MDL-45398-master' of git://github.com/sammarshallou/moodle
authorMarina Glancy <marina@moodle.com>
Thu, 8 May 2014 04:04:53 +0000 (12:04 +0800)
committerMarina Glancy <marina@moodle.com>
Thu, 8 May 2014 04:04:53 +0000 (12:04 +0800)

Trivial merge