Merge branch 'MDL-30290' of git://github.com/scriby/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 18 Nov 2011 12:40:16 +0000 (13:40 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 18 Nov 2011 12:40:16 +0000 (13:40 +0100)

Trivial merge