Merge branch 'MDL-53154-master' of git://github.com/junpataleta/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 29 Feb 2016 02:13:06 +0000 (10:13 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 29 Feb 2016 02:13:06 +0000 (10:13 +0800)

Trivial merge