Merge branch 'MDL-54797' of git://github.com/aolley/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 14 Jun 2016 05:24:47 +0000 (13:24 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 16 Jun 2016 08:04:07 +0000 (09:04 +0100)
commit45a0932a9e2cefb8783cccaf78e4d3e2391b1003
tree68c8bf8fed18d0b4df552d0f3c9acbf4fa3003de
parent337ee7ffa278097f35c33fc0d14a3b8d5d50e644
parente9f7c4a4b271c1b640639b9feca6430eddf5aee9
Merge branch 'MDL-54797' of git://github.com/aolley/moodle