Merge branch 'MDL-26285' of git://git.luns.net.uk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 7 Jul 2011 00:10:13 +0000 (02:10 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 7 Jul 2011 00:10:13 +0000 (02:10 +0200)
commitdfef3028ae05d9ff25420b3afa5f93e7070f2341
treed45d1be159f4ee9c3dd44128ddbbeb96f6efacee
parent25e2bb1b83166f09817648377df8bcb1ba7b67d4
parentac9695e5d87a762822b65f697ed6066161b00410
Merge branch 'MDL-26285' of git://git.luns.net.uk/moodle