Merge branch 'MDL-54562_master' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 13 Jun 2016 08:17:49 +0000 (09:17 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 13 Jun 2016 08:17:49 +0000 (09:17 +0100)
commit88b00451060b12c61e912f6121a10a9e7e9443df
tree212e1fde66e9cf1989f5927fad42d2e22a125313
parentf3caf30690de0f1d25fe77bf4e3c7d096fea088a
parente5fa1c5781a71f76df911c4eeded8b57a49e7118
Merge branch 'MDL-54562_master' of git://github.com/dmonllao/moodle