Merge branch 'MDL-29511' of git://github.com/timhunt/moodle
commitc72cf85f175578b54f7804247ed0108fa353446c
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 3 Oct 2011 23:11:20 +0000 (4 01:11 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 3 Oct 2011 23:11:20 +0000 (4 01:11 +0200)
treedc755a0e83fc15ee7c293b32832017ed499b0a92
parent38697ad4aaa0aec6b4e091867876a331742620d7
parentf123d67f602b965840b34940f25a6966cbce7fa8
Merge branch 'MDL-29511' of git://github.com/timhunt/moodle