Merge branch 'wip-MDL-39575-m25' of git://github.com/samhemelryk/moodle
commit9d5ec394537dd38a154858d831ce8cab85f5ad18
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 10 May 2013 10:06:38 +0000 (10 12:06 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 10 May 2013 10:06:38 +0000 (10 12:06 +0200)
treebf16ce789f009c38e6f6ce9678068600490576cf
parent8b5647b8d70660349ab9943e21b9c9ea4760ca70
parent1168a5f2e3793b207fab30bac19075527b96300a
Merge branch 'wip-MDL-39575-m25' of git://github.com/samhemelryk/moodle