Merge branch 'MDL-42760-master' of git://github.com/mouneyrac/moodle
authorMarina Glancy <marina@moodle.com>
Fri, 8 Nov 2013 03:10:41 +0000 (14:10 +1100)
committerMarina Glancy <marina@moodle.com>
Fri, 8 Nov 2013 03:10:41 +0000 (14:10 +1100)

Trivial merge