Merge branch 'MDL-37566-m' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 5 Feb 2013 00:14:07 +0000 (01:14 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 5 Feb 2013 00:14:07 +0000 (01:14 +0100)
commitb7c238798cc205b15cbea0dfe8e30b7ba75d4cb7
treeab671323c5b7be23c46a9d9b3905bc5a32565719
parent1df33d5427ac583454f2d6eb818cbd24cbcc20b0
parentc1b75ece94a72275b68e6a7cb4de333813a77c13
Merge branch 'MDL-37566-m' of git://github.com/andrewnicols/moodle