Merge branch 'MDL-31065_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE
commite06a172b7057a41d1eb52b9a2d7a66987b5a4131
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 23 Jan 2012 23:06:55 +0000 (24 00:06 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 23 Jan 2012 23:06:55 +0000 (24 00:06 +0100)
tree7951bb616ed4d8d42d944c87769bd69e3d917a53
parentbfa2605567cf52b7ddaade423342c3b980ae5d8c
parente6dedfe20b474b4295d976d947c27f76f6778f84
Merge branch 'MDL-31065_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE