Merge branch 'wip-MDL-26979-master' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 15 Aug 2011 20:46:01 +0000 (22:46 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 15 Aug 2011 20:46:01 +0000 (22:46 +0200)
commiteed36bbbd9949a7b5399ce8a421a72412fea30ec
tree709d2756579fa24a3b23f74bb1007620f217b98f
parentace24aaa7d9df69c6e4cc44b4ceee20d506df7cf
parent6c95e46a15512a45637ea3f1f4adc5ae77ba3161
Merge branch 'wip-MDL-26979-master' of git://github.com/samhemelryk/moodle