Merge branch 'MDL-51236-master' of git://github.com/andrewnicols/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 1 Sep 2015 14:18:31 +0000 (15:18 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 1 Sep 2015 14:18:31 +0000 (15:18 +0100)

Trivial merge