Merge branch 'MDL-40434' of git://github.com/timhunt/moodle
authorMarina Glancy <marina@moodle.com>
Tue, 9 Jul 2013 01:30:42 +0000 (11:30 +1000)
committerMarina Glancy <marina@moodle.com>
Tue, 9 Jul 2013 01:30:42 +0000 (11:30 +1000)

Trivial merge