Merge branch 'MDL-29570' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 3 Oct 2011 19:42:28 +0000 (21:42 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 3 Oct 2011 19:42:28 +0000 (21:42 +0200)
commiteefebc2edb3e71b1e298d46b3178ab5674f6aa64
treeb1abb51d68dda8d453193f498a7fd8bfd5bdf18d
parent6d3ae9103cb068617fd2b5891ab92a6f776986c4
parent72bbb091a4b5b7eaeb5aedca2285066036065db6
Merge branch 'MDL-29570' of git://github.com/timhunt/moodle