Merge branch 'w03_MDL-36411_m25_setup' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 Jan 2013 19:08:12 +0000 (20:08 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 Jan 2013 19:08:12 +0000 (20:08 +0100)
commitfa669c49adc1f342d804a39a811fc95795296d3b
tree6eb2f9d7e26d1932c813b705769d03d937b470cf
parentea4edbd6bcf376ce2e9aa295c656b5695ee1e27e
parent6a8e46791655936553dcb36785c980bf136d07b3
Merge branch 'w03_MDL-36411_m25_setup' of git://github.com/skodak/moodle