Merge branch 'MDL-41993-master-fix1' of git://github.com/damyon/moodle
authorMarina Glancy <marina@moodle.com>
Wed, 9 Oct 2013 22:36:30 +0000 (09:36 +1100)
committerMarina Glancy <marina@moodle.com>
Wed, 9 Oct 2013 22:36:30 +0000 (09:36 +1100)

Trivial merge