Merge branch 'MDL-26848' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 Mar 2011 20:56:46 +0000 (21:56 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 Mar 2011 20:56:46 +0000 (21:56 +0100)
commitc6f7c3e7f3f2ec965a6401f278b207a5735c0c3d
treeee5d8ad4d90e8851c5fbb89ff436dfb3e09e233f
parentbc35885cb4755fa966dc38fb70a0490e09ee1d33
parentea003cd59a37fc063bf9e3b5f8cc970f4ab08fec
Merge branch 'MDL-26848' of git://github.com/timhunt/moodle