Merge branch 'wip-MDL-32417-master' of git://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 25 Apr 2012 01:40:53 +0000 (03:40 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 25 Apr 2012 01:40:53 +0000 (03:40 +0200)
commit9c51f675fa7aebb7c77839a4815a2b8cab1c09c5
treea8934dbe8addba7424d52ca91093d9bb9ef37d97
parent344c07c3de449537b94df69b856d777d6a649291
parent6819c4287d9bdaf99420ddadb94f5038ea47ff46
Merge branch 'wip-MDL-32417-master' of git://github.com/marinaglancy/moodle