Merge branch 'MDL-47166-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 20 Jan 2015 15:14:26 +0000 (16:14 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 20 Jan 2015 15:14:26 +0000 (16:14 +0100)
commit782ea98c59945864cfcc3ab44a6f17d49a9ed39f
treef00dffbc51fc8bbe1bb3d5bf346bd3320df55e91
parent53aa8423bd39de77959143205a3c9fa7d789238f
parent455c8cdee6fb0300fcb40456f45703f601ab6082
Merge branch 'MDL-47166-master' of git://github.com/andrewnicols/moodle