Merge branch 'wip-MDL-39525-m25' of git://github.com/samhemelryk/moodle
commit52933ab0871fdc1a42e956c0378dd87e4f536acc
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 7 May 2013 19:28:09 +0000 (7 21:28 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 7 May 2013 19:28:09 +0000 (7 21:28 +0200)
tree3f151ec6efa3dfd273d2a534e3fe3f02e73070b7
parent3705a6dcbe14484146cb9814e7ef1abe8ec884f7
parent045fe95c6310e9aee3e6840c66756f4a6c7f400c
Merge branch 'wip-MDL-39525-m25' of git://github.com/samhemelryk/moodle