Merge branch 'wip-MDL-37983-master' of git://github.com/abgreeve/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 4 Mar 2013 15:42:25 +0000 (16:42 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 4 Mar 2013 15:42:25 +0000 (16:42 +0100)

Trivial merge