Merge branch 'MDL-50663-master' of https://github.com/sk-unikent/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 21 Jul 2015 14:40:10 +0000 (15:40 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 21 Jul 2015 14:40:10 +0000 (15:40 +0100)

Trivial merge