Merge branch 'equella' of git://github.com/danpoltawski/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 12 Jun 2012 00:22:26 +0000 (02:22 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 12 Jun 2012 00:22:26 +0000 (02:22 +0200)
commit37b8257de52acb97915512ee328cb815a8104201
treece8486639efc9d9f37b5ef4d1012aba0ed6a479a
parent42fd3961713306e773f5b80e14926cd6e91ac9f2
parentd66e5720a111f4a7f63ef594c16060c8dbc6bbef
Merge branch 'equella' of git://github.com/danpoltawski/moodle