Merge branch 'MDL-50312_master' of https://github.com/jinhofer/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 23 Feb 2016 08:07:13 +0000 (08:07 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 23 Feb 2016 08:07:13 +0000 (08:07 +0000)

Trivial merge