Merge branch 'MDL-26324' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 7 Mar 2011 00:22:43 +0000 (01:22 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 7 Mar 2011 00:22:43 +0000 (01:22 +0100)
commit5ff33ba14bf8c5be29092274aa5ea6768dc89b6f
tree34b6557121e600518ecc4554449d978118ebe981
parent34e30d9bce48a305db3906285e6dc0d214d01c63
parent0357171e6859097bc3737bc0127e11e5bcbe13ef
Merge branch 'MDL-26324' of git://github.com/timhunt/moodle