Merge branch 'MDL-27550-workshop-feedback' of git://github.com/mudrd8mz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 10 Aug 2011 00:47:57 +0000 (02:47 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 10 Aug 2011 00:47:57 +0000 (02:47 +0200)

Trivial merge