Merge branch 'mdl41996-master' of https://github.com/tlock/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 1 Oct 2013 18:01:33 +0000 (20:01 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 1 Oct 2013 18:01:33 +0000 (20:01 +0200)
commit098723aabb69854d08285dc56bcee949ffb6a9ab
tree989b955651306734d945bd5b395a09388d775ee2
parent46e11c669022d42aeee558c03788b5ba9d4d420e
parent7d0f566b2da72388d4df07dde99bd1ad491e4875
Merge branch 'mdl41996-master' of https://github.com/tlock/moodle