Merge branch 'MDL-31314_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE
commit7769c0f2f8a8581e0d15bcadec6b405e3ee0ebc5
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 31 Jan 2012 16:06:26 +0000 (31 17:06 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 31 Jan 2012 16:06:26 +0000 (31 17:06 +0100)
treea890f8af44ed2cfe1a98f5eb4e6bb15316aade2a
parent49b52b3fb4bf62a42bf08f9daa3bcd62f83e6cac
parent5fedb6302b7ff0db1e546bad4bc0178ab266fdd1
Merge branch 'MDL-31314_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE