Merge branch 'MDL-30484_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE
commit764525a02c4bb51c926997e1c83b65dea1dce949
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 31 Jan 2012 16:17:05 +0000 (31 17:17 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 31 Jan 2012 16:17:05 +0000 (31 17:17 +0100)
treeee7906a278853de483f97d9afa34cd76573ac84b
parent7769c0f2f8a8581e0d15bcadec6b405e3ee0ebc5
parentf95d0a51f1cc49019d7f5af29a7cae6421aeb366
Merge branch 'MDL-30484_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE