Merge branch 'MDL-26546-workshop-restore' of git://github.com/mudrd8mz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 22 Feb 2011 22:00:46 +0000 (23:00 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 22 Feb 2011 22:00:46 +0000 (23:00 +0100)
commitfa188aa0a21f550e4a829379ee07452e50ed1ef1
tree284a4cc41eed4d206f9b1941bed43a085181dd80
parentd6211dce9a4bb5aa1c8148cf19b6c949ba9fe4ba
parent1dade8b185111df4b39693bc45d8d49e928e7d7a
Merge branch 'MDL-26546-workshop-restore' of git://github.com/mudrd8mz/moodle