Merge branch 'wip-MDL-30582-master' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 8 Dec 2011 00:36:44 +0000 (01:36 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 8 Dec 2011 00:36:44 +0000 (01:36 +0100)

Trivial merge