Merge branch 'MDL-37459-master-fix' of https://github.com/damyon/moodle
authorMarina Glancy <marina@moodle.com>
Tue, 11 Jun 2013 05:32:27 +0000 (15:32 +1000)
committerMarina Glancy <marina@moodle.com>
Tue, 11 Jun 2013 05:32:27 +0000 (15:32 +1000)

Trivial merge