Merge branch 'MDL-29506-master' of git://github.com/andrewnicols/moodle
commitc70d54405b88476b12100144ef24e3235dbe9b55
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 16 Feb 2016 16:50:22 +0000 (16 17:50 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 16 Feb 2016 16:50:22 +0000 (16 17:50 +0100)
treebe8812282dd60568f531e44908a1c52fffe3745d
parent8bd2db20237d893c6384e94e2d218ee348a3457e
parent66a70b97ead647de0300e2f7ef1bb1826f0bc34d
Merge branch 'MDL-29506-master' of git://github.com/andrewnicols/moodle