Merge branch 'MDL-27937' of git://github.com/timhunt/moodle
commite345969ae20566ad386a73aad547c23fc8b39f6e
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 22 Jun 2011 22:46:29 +0000 (23 00:46 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 22 Jun 2011 22:46:29 +0000 (23 00:46 +0200)
tree1b9f7e392266ea23432c959e89e018eafbcb7af2
parente059fa90b1ada5d24824682f88764bdc99beeeed
parenteb624cf7e0e080b5cfbfa033acfcd1ef3dcd41eb
Merge branch 'MDL-27937' of git://github.com/timhunt/moodle