Merge branch 'MDL-56994-master-2' of git://github.com/junpataleta/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 21 Nov 2016 07:30:58 +0000 (07:30 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 21 Nov 2016 07:30:58 +0000 (07:30 +0000)

Trivial merge