Merge branch 'wip-MDL-26500' of git://github.com/danpoltawski/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 23 Apr 2012 22:03:36 +0000 (00:03 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 23 Apr 2012 22:03:36 +0000 (00:03 +0200)

Trivial merge