Merge branch 'MDL-51261-master-upgradekey' of git://github.com/mudrd8mz/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 29 Sep 2015 11:33:14 +0000 (12:33 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 29 Sep 2015 11:33:14 +0000 (12:33 +0100)

Trivial merge