Merge branch 'MDL-42528' of https://github.com/merrill-oakland/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 29 Oct 2013 07:03:52 +0000 (15:03 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 29 Oct 2013 07:03:52 +0000 (15:03 +0800)

Trivial merge