Merge branch 'MDL-40441' of git://github.com/timhunt/moodle
authorMarina Glancy <marina@moodle.com>
Wed, 10 Jul 2013 00:02:04 +0000 (10:02 +1000)
committerMarina Glancy <marina@moodle.com>
Wed, 10 Jul 2013 00:02:04 +0000 (10:02 +1000)

Trivial merge