Merge branch 'MDL-26570' of git://github.com/samhemelryk/moodle
commitbf1a4d75e01630a6eb2875b995e0c44ecc61a422
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 Mar 2011 20:34:17 +0000 (21 21:34 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 Mar 2011 20:34:17 +0000 (21 21:34 +0100)
tree1af18ae9b42f0cbe81a95b3ae0a617fd76297971
parent8c2e4c90d71d274cdeff3e8b08c5af174fc41268
parentdd1896470386e58c46d78bf5440fb839d63edf2e
Merge branch 'MDL-26570' of git://github.com/samhemelryk/moodle