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)
commit915a20f5a58d10aefb1497857a769fa5d176ec73
tree14950aad64751ced1f649d97a2d66594cb92656c
parent0797530336368a91cc0c7af18aa66a2d94ef2939
parent7c26c3f87564ab65a2135dff746eccd290bd4c87
Merge branch 'MDL-26546-workshop-restore' of git://github.com/mudrd8mz/moodle