Merge branch 'MDL-40829_mc' of https://github.com/rwijaya/moodle
authorMarina Glancy <marina@moodle.com>
Thu, 3 Oct 2013 08:10:31 +0000 (18:10 +1000)
committerMarina Glancy <marina@moodle.com>
Thu, 3 Oct 2013 08:10:31 +0000 (18:10 +1000)

Trivial merge