Merge branch 'w37_MDL-35270_m24_oracohort' of git://github.com/skodak/moodle
commit70a491c20e37696a7be5a3245a9ae8e69da62d2c
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 10 Sep 2012 23:48:34 +0000 (11 01:48 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 10 Sep 2012 23:48:34 +0000 (11 01:48 +0200)
tree9a9405cde976a7c157dd20081c7875a6b14bdadb
parent20b133e7a31dadc4d26bb16bfab86881a15b20f2
parent7fc9433c87468dbd352134660422dd3b55ca9aac
Merge branch 'w37_MDL-35270_m24_oracohort' of git://github.com/skodak/moodle