Merge branch 'MDL-28469_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE
commitf1ae261bc98fcf084819b498f6c6c3d5822ee029
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 4 Oct 2011 23:14:47 +0000 (5 01:14 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 4 Oct 2011 23:14:47 +0000 (5 01:14 +0200)
tree549e36a012a65fc993cc3d51b9ae5e06a8caef81
parent19fcc09ac7a57f7c3c25e5f607e672439a47bef4
parent8f40d27954cdabab1984591e0ff53ea78f6adb44
Merge branch 'MDL-28469_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE