Merge branch 'MDL-30851_master_wip' of git://github.com/grabs/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 2 Jan 2012 19:23:11 +0000 (20:23 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 2 Jan 2012 19:23:11 +0000 (20:23 +0100)
commitc31d7ca2e0b63cdc2dfa150a51ff82d9d19fd33e
tree3478ff52c245156ee50bd3885243f9097f42f6fa
parent6f68eabb7e09c255907ec5425c47331ce2b2b136
parent0f61fb72d895b5af02506403278ab34f5aa3b234
Merge branch 'MDL-30851_master_wip' of git://github.com/grabs/moodle