Merge branch 'MDL-35026' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Aug 2012 15:53:59 +0000 (17:53 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Aug 2012 15:53:59 +0000 (17:53 +0200)
commit4299f5f6a8c5b843c18932c2bd9530b0e1534958
tree658422a17358c63babaaadece0db6081894e3ba0
parent7f7cda07f2ca535fc686c4a7d859696c92d1ee92
parente7a6779efbc1db177cca7dbe371361d1aecb814d
Merge branch 'MDL-35026' of git://github.com/timhunt/moodle