Merge branch 'MDL-30274-master-1' of git://git.luns.net.uk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 16 Nov 2011 21:51:51 +0000 (22:51 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 16 Nov 2011 21:51:51 +0000 (22:51 +0100)
commitcfaa2bd7441aa3ad4579961f9434b95188c77c1a
treebbb96088bb8cd6c6e4bede262aef7538165e0eab
parent2fee72e19b20f34582090543986f5e4af0a2bc3d
parent4a645a682120adbec21a597abecf786cf25cbb83
Merge branch 'MDL-30274-master-1' of git://git.luns.net.uk/moodle