Merge branch 'MDL-37621-master-fix2' of git://github.com/damyon/moodle
authorMarina Glancy <marina@moodle.com>
Wed, 12 Jun 2013 07:22:22 +0000 (17:22 +1000)
committerMarina Glancy <marina@moodle.com>
Wed, 12 Jun 2013 07:22:22 +0000 (17:22 +1000)

Trivial merge