Merge branch 'MDL-37459-master' of https://github.com/damyon/moodle
authorMarina Glancy <marina@moodle.com>
Tue, 11 Jun 2013 04:57:34 +0000 (14:57 +1000)
committerMarina Glancy <marina@moodle.com>
Tue, 11 Jun 2013 04:57:34 +0000 (14:57 +1000)

Trivial merge