Merge branch 'MDL-42023-master' of git://github.com/damyon/moodle
authorMarina Glancy <marina@moodle.com>
Thu, 3 Oct 2013 03:08:03 +0000 (13:08 +1000)
committerMarina Glancy <marina@moodle.com>
Thu, 3 Oct 2013 03:08:03 +0000 (13:08 +1000)

Trivial merge