Merge branch 'MDL-42697-master' of git://github.com/andrewnicols/moodle
authorMarina Glancy <marina@moodle.com>
Thu, 7 Nov 2013 05:31:01 +0000 (16:31 +1100)
committerMarina Glancy <marina@moodle.com>
Thu, 7 Nov 2013 05:31:01 +0000 (16:31 +1100)

Trivial merge