Merge branch 'MDL-37065-master' of git://github.com/damyon/moodle
authorMarina Glancy <marina@moodle.com>
Tue, 9 Jul 2013 08:06:33 +0000 (18:06 +1000)
committerMarina Glancy <marina@moodle.com>
Tue, 9 Jul 2013 08:06:33 +0000 (18:06 +1000)

Trivial merge