Merge branch 'MDL-30854' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 31 Jan 2012 18:30:58 +0000 (19:30 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 31 Jan 2012 18:30:58 +0000 (19:30 +0100)
commitba353742ce0fb45da1064212dbbe51417a9bf5e8
treed3a6d5b07c38095bd27ad8e993b3fd5a74fe2a33
parent7ce92ac1ad95c0ed4d4a8681673db08700d9cfa7
parent72553162baa28538028d3b4e59f85e4aa64ea5f6
Merge branch 'MDL-30854' of git://github.com/timhunt/moodle