Merge branch 'MDL-29879' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 1 Nov 2011 19:12:45 +0000 (20:12 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 1 Nov 2011 19:12:45 +0000 (20:12 +0100)
commit5fbf87c802917514d33800981752af62f9903944
treea3a8961dc12dec587742cec82dbbebb7e07286b4
parent313e048981abb5a55b06980f13285565a0a71f2f
parent78f8261f6e0809f6c7c7bbc6085f55a031e141d9
Merge branch 'MDL-29879' of git://github.com/timhunt/moodle