Merge branch 'MDL-35851-master' of git://github.com/damyon/moodle
authorMarina Glancy <marina@moodle.com>
Tue, 16 Jul 2013 06:10:13 +0000 (16:10 +1000)
committerMarina Glancy <marina@moodle.com>
Tue, 16 Jul 2013 06:10:13 +0000 (16:10 +1000)

Trivial merge