Merge branch 'w07_MDL-26352_20_metacourse' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 13 Feb 2011 23:52:09 +0000 (00:52 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 13 Feb 2011 23:52:09 +0000 (00:52 +0100)
commitc0d0dd4a5a4da3dba3457530907ee5b89dc5910a
treeee265561b6e568a324c14f3eec8317a44919b6e0
parent798e6fcba2e1d81a4d1a32c1e8c92e64ba23c39f
parentd21feffdd76ebc96c1987fbfc57450538e7016b8
Merge branch 'w07_MDL-26352_20_metacourse' of git://github.com/skodak/moodle