Merge branch 'MDL-52270_master' of https://github.com/dmonllao/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 19 Jan 2016 00:35:23 +0000 (08:35 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 19 Jan 2016 00:35:23 +0000 (08:35 +0800)
commitfe99a278592cf3b024522032d0743bc610e7842c
tree69835866bddab28162aae7b85f1c60fa90b2329a
parent441ffe514e6bd27e678c713e59a442c9afb814f5
parent59e95487622652cb2bbed2cb2888f81bd3441290
Merge branch 'MDL-52270_master' of https://github.com/dmonllao/moodle