Merge branch 'wip-MDL-27988-master' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 29 Jun 2011 16:12:18 +0000 (18:12 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 29 Jun 2011 16:12:18 +0000 (18:12 +0200)

Trivial merge