Merge branch 'MDL-53260-master' of git://github.com/junpataleta/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 21 Mar 2016 07:14:23 +0000 (15:14 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 21 Mar 2016 07:14:23 +0000 (15:14 +0800)

Trivial merge