Merge branch 'MDL-50321-master-modupgradetxt' of git://github.com/mudrd8mz/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 25 May 2015 11:30:34 +0000 (12:30 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 25 May 2015 11:30:34 +0000 (12:30 +0100)

Trivial merge