Merge branch 'MDL-51715_master_invalidweights' of https://github.com/colin-umn/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 19 Jan 2016 10:39:48 +0000 (10:39 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 19 Jan 2016 10:39:48 +0000 (10:39 +0000)

Trivial merge