Merge branch 'MDL-54008_master-normalise' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 3 May 2016 07:56:58 +0000 (08:56 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 3 May 2016 07:56:58 +0000 (08:56 +0100)

Trivial merge