Merge branch 'MDL-26338' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Feb 2011 18:57:38 +0000 (19:57 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Feb 2011 18:57:38 +0000 (19:57 +0100)
commit89bf60cdbcf70f49dedc327459fdf77b1000383e
tree7641dfed3f0611979b3ae0c0f560903a0683109d
parent1ae279b448c7bac491087110c09a933dc95af6cd
parentdc3826eed73a677a53b2f6de6d7e8a8886cf60aa
Merge branch 'MDL-26338' of git://github.com/timhunt/moodle