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

Trivial merge