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)
commitef55f150e17632fb2d56071338eab8c5ab0890c7
treee3bee6521cd336388ba1d2bfc7fa79f9de339b4b
parentd0ec347a760a33c0d2df53e4187881b4928c2c27
parent143f410a2f9b3537ea7faa0f1bb4cf4e99005cef
Merge branch 'MDL-54008_master-normalise' of git://github.com/dmonllao/moodle