Merge branch 'MDL-41608-master' of git://github.com/jethac/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 7 Apr 2015 14:40:06 +0000 (15:40 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 7 Apr 2015 14:40:06 +0000 (15:40 +0100)

Trivial merge