Merge branch 'MDL-28684' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 24 Aug 2011 15:08:31 +0000 (17:08 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 24 Aug 2011 15:08:31 +0000 (17:08 +0200)
commitf04da0f051d8474efdd63ebc4c4f6dccb6d27f08
treea16add085078a471cf24186f0c59af5d3e577afd
parenta3f2ad4e80906e122f1a3c34ff8b890a12329e5e
parent4ca3f2d16731a56a3a4242c6d538e2d6634de567
Merge branch 'MDL-28684' of git://github.com/timhunt/moodle