Merge branch 'MDL-52862_master' of https://github.com/juancs/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 16 Feb 2016 15:18:46 +0000 (15:18 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 16 Feb 2016 15:18:46 +0000 (15:18 +0000)

Trivial merge