Merge branch 'MDL-9873' of https://github.com/merrill-oakland/moodle
authorMarina Glancy <marina@moodle.com>
Tue, 1 Oct 2013 23:20:52 +0000 (09:20 +1000)
committerMarina Glancy <marina@moodle.com>
Tue, 1 Oct 2013 23:20:52 +0000 (09:20 +1000)

Trivial merge