Merge branch 'MDL-28684_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE
commitddec658859c27366dbf2f64f226aeb5484c0b463
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 24 Aug 2011 15:12:18 +0000 (24 17:12 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 24 Aug 2011 15:12:18 +0000 (24 17:12 +0200)
tree0aa05b58591c6f3b410c8313ffce40de5ef5ce83
parent7faa5b4e9cdb07f1a5aa71009cca52145dbdd5b5
parente9f707d38a9bc5b43a9beb63b905e423223b5246
Merge branch 'MDL-28684_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE