Merge branch 'MDL-26546-workshop-restore' of git://github.com/mudrd8mz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 22 Feb 2011 11:24:48 +0000 (12:24 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 22 Feb 2011 11:24:48 +0000 (12:24 +0100)

Trivial merge