Merge branch 'MDL-26636' of git://github.com/timhunt/moodle
commit5878504958368b9562be7e35628e01c8e903996f
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 6 Mar 2011 23:25:54 +0000 (7 00:25 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 6 Mar 2011 23:25:54 +0000 (7 00:25 +0100)
tree26a9b14465605a0085811d9c6ac89d4e70a5df82
parent4b43b1074f112a39a745f28affceb6fa0fd2e04b
parentb302591de88462529927a3e0ad2701da29425d18
Merge branch 'MDL-26636' of git://github.com/timhunt/moodle