Merge branch 'MDL-25834' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 Mar 2011 20:54:57 +0000 (21:54 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 Mar 2011 20:54:57 +0000 (21:54 +0100)

Trivial merge