Merge branch 'MDL-28679_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE
commit5af8bbf85437bbfc2c06728ee90de09f8d2eb5b7
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 19 Sep 2011 22:04:17 +0000 (20 00:04 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 19 Sep 2011 22:04:17 +0000 (20 00:04 +0200)
tree015819d7271d2f78c17d98b6a466f70fb3cd6bab
parent75ebacb1ec86d8f64ac7c1432fe528c69b11b583
parent08d1ba7106bff693a0a4ed4db288c07f4cfbe190
Merge branch 'MDL-28679_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE