Merge branch 'MDL-42566_master' of https://github.com/markn86/moodle
authorMarina Glancy <marina@moodle.com>
Mon, 4 Nov 2013 06:22:45 +0000 (17:22 +1100)
committerMarina Glancy <marina@moodle.com>
Mon, 4 Nov 2013 06:22:45 +0000 (17:22 +1100)

Trivial merge