Merge branch 'MDL-25621' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 Mar 2011 20:32:50 +0000 (21:32 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 Mar 2011 20:32:50 +0000 (21:32 +0100)
commit8c2e4c90d71d274cdeff3e8b08c5af174fc41268
tree3b6985fc575ce074281ef6c237414042d525c71c
parentbe5eb0013ea262ce709fb69eac452e7afc8ee1b8
parentced9fc4453653a6b74dbac78c85ec411bb1b4c5c
Merge branch 'MDL-25621' of git://github.com/samhemelryk/moodle