Merge branch 'MDL-52585-master' of git://github.com/jleyva/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 12 Jan 2016 06:35:36 +0000 (14:35 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 12 Jan 2016 09:31:08 +0000 (09:31 +0000)
commitc7198e2a0ea7db5823b9b5b4961e3e303124e01d
treeb65e8976c62889ea9b6f29c8f7525bd4abd80341
parent8b9a15bbab788bbdb998c53c0033a07a6ad895d1
parent2a72d9d2377ac378146181600eba3884b7d1ef83
Merge branch 'MDL-52585-master' of git://github.com/jleyva/moodle