Merge branch 'MDL-43620_m31v2' of https://github.com/sbourget/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 13 Jan 2016 01:38:45 +0000 (09:38 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 13 Jan 2016 01:38:45 +0000 (09:38 +0800)
commit1b67113353489075d6b77f63a01ab147a18a7ffb
tree52b536002206fd8f74167fc9d253d304678b7359
parentca922c24e75f743ed51a1e5c2c03fa919a33084f
parent8cf5ac4acc6c9b945d5aa8dfe7fe57036e130e80
Merge branch 'MDL-43620_m31v2' of https://github.com/sbourget/moodle