Merge branch 'MDL-42021-master-int' of git://github.com/FMCorz/moodle
authorMarina Glancy <marina@moodle.com>
Wed, 2 Oct 2013 07:01:12 +0000 (17:01 +1000)
committerMarina Glancy <marina@moodle.com>
Wed, 2 Oct 2013 07:01:12 +0000 (17:01 +1000)

Trivial merge