Merge branch 'MDL-26714' of git://github.com/timhunt/moodle
commit7e0579cb8c4ef2caa32fc4094f4aa74e703f4444
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 13 Mar 2011 23:43:58 +0000 (14 00:43 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 13 Mar 2011 23:43:58 +0000 (14 00:43 +0100)
treee9815f0f887e420063f05ebf85127d3ee01f6892
parent99294459266dbc3da9ab6973d57e1b2c3c0bfedf
parent9316d661217ac59f6ed903152c813f88faedbe79
Merge branch 'MDL-26714' of git://github.com/timhunt/moodle