Merge branch 'MDL-26730' of git://github.com/timhunt/moodle
commit5cd0d27089c766cb35eca7f854560f5dcac4b268
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 13 Mar 2011 22:50:20 +0000 (13 23:50 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 13 Mar 2011 22:50:20 +0000 (13 23:50 +0100)
tree978075a846dc69e4e1c2459e189656b16da80a04
parentb5686d021b46e5f59b0672d6b18fa53e580b9a46
parentb053dcab0f4274754f088e2f417a51c20f311578
Merge branch 'MDL-26730' of git://github.com/timhunt/moodle