Merge branch 'MDL-33681_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE
commite9637ea9ced8aff9539d4aae15e3a7f030bd21ec
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 12 Jun 2012 22:07:23 +0000 (13 00:07 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 12 Jun 2012 22:07:23 +0000 (13 00:07 +0200)
tree48b18ab6e1be0743df2cd377cbfe5c0cbce086c7
parent417f9d311bc92f5af7a2142b54a9f2f23f09245a
parentd375d718acf6da7d22359c448dda572d803e309c
Merge branch 'MDL-33681_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE