Merge branch 'MDL-42143-master' of git://github.com/danpoltawski/moodle
authorMarina Glancy <marina@moodle.com>
Thu, 10 Oct 2013 00:12:35 +0000 (11:12 +1100)
committerMarina Glancy <marina@moodle.com>
Thu, 10 Oct 2013 00:12:35 +0000 (11:12 +1100)

Trivial merge