Merge branch 'MDL-25176' of https://github.com/merrill-oakland/moodle
authorMarina Glancy <marina@moodle.com>
Tue, 8 Oct 2013 01:03:15 +0000 (12:03 +1100)
committerMarina Glancy <marina@moodle.com>
Tue, 8 Oct 2013 01:03:15 +0000 (12:03 +1100)

Trivial merge