Merge branch 'MDL-23967' of git://git.luns.net.uk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 10 Aug 2011 00:04:55 +0000 (02:04 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 10 Aug 2011 00:04:55 +0000 (02:04 +0200)

Trivial merge