Merge branch 'MDL-45387-master' of git://github.com/jethac/moodle
authorMarina Glancy <marina@moodle.com>
Wed, 7 May 2014 05:06:30 +0000 (13:06 +0800)
committerMarina Glancy <marina@moodle.com>
Wed, 7 May 2014 05:06:30 +0000 (13:06 +0800)

Trivial merge