Merge branch 'MDL-52661-master' of git://github.com/junpataleta/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 12 Jan 2016 12:56:09 +0000 (12:56 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 12 Jan 2016 12:56:09 +0000 (12:56 +0000)

Trivial merge