Merge branch 'MDL-57737-master' of git://github.com/crazyserver/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 23 Jan 2017 09:26:57 +0000 (09:26 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 23 Jan 2017 09:26:57 +0000 (09:26 +0000)
commitc44913b845a235a1b48477c761ef268d56a3bab4
tree0a0a04b98f5793015d45199dd4e02b37c14dfd75
parent5130953c8a103c44111a3c987cf47ed3c7a5c84b
parentef75a648c9f46e91971333bc130ee8a2e9110417
Merge branch 'MDL-57737-master' of git://github.com/crazyserver/moodle