Merge branch 'MDL-49754-master' of https://github.com/xow/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 25 Apr 2016 13:13:51 +0000 (14:13 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 25 Apr 2016 13:13:51 +0000 (14:13 +0100)

Trivial merge