Merge branch 'MDL-26875' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 Mar 2011 20:10:55 +0000 (21:10 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 Mar 2011 20:10:55 +0000 (21:10 +0100)
commitc031f2c1e7388c3fd60266777d9bb7b969bb2d53
tree136c7cafad4ddb40ef0bdba2a2c2bcf0dc49554e
parent63187a688768ff51859ebb7eec1c422b8f37e815
parent4c2820fbd820b5b1e694b0ba9751d19fb4525a02
Merge branch 'MDL-26875' of git://github.com/samhemelryk/moodle