Merge branch 'MDL-30120' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 24 Jan 2012 23:47:10 +0000 (00:47 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 24 Jan 2012 23:47:10 +0000 (00:47 +0100)
commit2def471913b46eed065e07cfaf4f4cc25d0832b0
treeec7b41d6532ccf39f0b0d88aa4fcb9a046e80b38
parent9a50502acc36994a786d3243e29fd159f31165db
parent0b94d6bff3bb7366bf78c4866f3da449f6597b56
Merge branch 'MDL-30120' of git://github.com/timhunt/moodle