Merge branch 'MDL-39518-master' of git://github.com/damyon/moodle
commit6382f49fb19bba466c057fe5089e8762e8154c7c
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 10 May 2013 11:17:16 +0000 (10 13:17 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 10 May 2013 11:17:16 +0000 (10 13:17 +0200)
treeb89735077ce923c97ecf2f51471661895b7ce12b
parent9d5ec394537dd38a154858d831ce8cab85f5ad18
parent727b8d54e46d6fd4beb74190760343e11055c740
Merge branch 'MDL-39518-master' of git://github.com/damyon/moodle