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)
commitf725158ea6398af77984fdae68f137b6df189869
tree90c700a5990fd3e00a5f9831f0c2d1d2e84908a0
parent93e490613ebf8f28ed4c930dfe672b4366c41617
parent75cde6b9ac7757d91cd3941cec75bb1c0f4aa708
Merge branch 'wip-MDL-36768-m24-r2' of git://github.com/samhemelryk/moodle