Merge branch 'wip-MDL-47812-master2' of git://github.com/marinaglancy/moodle
commite739fbcf27ee182f5737905230ecce46a596face
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 24 Oct 2014 09:05:54 +0000 (24 11:05 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 24 Oct 2014 09:05:54 +0000 (24 11:05 +0200)
treedf889925ab71537b55fa17195c62b6bd3a668d0a
parent8950e7f5351f3341021caf34eab3f28d835cd763
parentd4a9e661301f2e39d4330f9608acda9bc9591264
Merge branch 'wip-MDL-47812-master2' of git://github.com/marinaglancy/moodle