Merge branch 'wip-MDL-36768-m24-r2' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 26 Nov 2012 01:28:12 +0000 (02:28 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 26 Nov 2012 01:28:12 +0000 (02:28 +0100)

Trivial merge