Merge branch 'MDL-37308-master' of git://github.com/junpataleta/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 1 Dec 2015 11:13:48 +0000 (11:13 +0000)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 3 Dec 2015 10:11:06 +0000 (11:11 +0100)
commit8e9dc75e6c1b030085ac1c38444afaae6e95369e
treea32b020f50e454fa460541d196d6a26a0b359a0c
parent87b2ed6c1ff84019bedf31e150dcc1574a99d733
parenta33e5debe9d9e74acb4fe0dc10c1da9d132791dd
Merge branch 'MDL-37308-master' of git://github.com/junpataleta/moodle