Merge branch 'MDL-40165-m' of git://github.com/andrewnicols/moodle
authorMarina Glancy <marina@moodle.com>
Tue, 18 Jun 2013 02:59:04 +0000 (12:59 +1000)
committerMarina Glancy <marina@moodle.com>
Tue, 18 Jun 2013 02:59:04 +0000 (12:59 +1000)

Trivial merge