Merge branch 'MDL-28614' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 17 Oct 2011 22:58:09 +0000 (00:58 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 17 Oct 2011 22:58:09 +0000 (00:58 +0200)
commitc78238f1517921ba1aa1c0118cc408f4cb92876a
treee86750ff31eda0ae99c42814bf4af6670587d5f6
parent4f50a62635346d6883206a6ab057eda4c7bde321
parent6fd1995d3bce55ef828c0530404dac9c7d85e0cd
Merge branch 'MDL-28614' of git://github.com/timhunt/moodle