Merge branch 'MDL-38214_wipd' of git://github.com/ppichet/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 14 Oct 2015 13:15:14 +0000 (14:15 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 14 Oct 2015 13:15:14 +0000 (14:15 +0100)

Trivial merge