Merge branch 'MDL-29216_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE
commitf0837f65d868a3d1cf70fa88750dbf0c6c8ada78
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 3 Oct 2011 20:55:56 +0000 (3 22:55 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 3 Oct 2011 20:55:56 +0000 (3 22:55 +0200)
treea3957858c6a59d08ab26b74a85eab6edbad39bd6
parenta70eda6cc8719d3da4a9dd7bec5892f420d716e8
parent22ba72591cde5c7c5c416afc00b21f021a39ad6f
Merge branch 'MDL-29216_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE