Merge branch 'MDL-39936-25' of git://github.com/danpoltawski/moodle into MOODLE_25_STABLE
commit618737d7e9e532596a00825d38fb4352d69e1cc4
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 3 Jun 2013 22:05:04 +0000 (4 00:05 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 3 Jun 2013 22:05:04 +0000 (4 00:05 +0200)
treef657436944de5ebcfd404d1da3003194e3035eb3
parent06ab9b88886cfb8671bb3460046b1b5ae71ca97b
parent2e804059400a3f9c3d967305257eacac727643f6
Merge branch 'MDL-39936-25' of git://github.com/danpoltawski/moodle into MOODLE_25_STABLE