Merge branch 'w11_MDL-31494_m23_adodblink' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 12 Mar 2012 12:38:30 +0000 (13:38 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 12 Mar 2012 12:38:30 +0000 (13:38 +0100)

Trivial merge