Merge branch 'wip-MDL-47976-master' of git://github.com/marinaglancy/moodle
commitb53c2a92d0f75eb9d7cbbd5c5644678fd6c251c2
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 4 Nov 2014 00:59:23 +0000 (4 01:59 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 4 Nov 2014 00:59:23 +0000 (4 01:59 +0100)
tree232cff09fb61b43fb2c9952cdeadfaec467f68ea
parentddb5bc5fcdfe6618960c8c2944ce8fbecbd84ffb
parent2e7eca137cb9dc5789a6ce99bef31ddd22ba1cc4
Merge branch 'wip-MDL-47976-master' of git://github.com/marinaglancy/moodle