Merge branch 'w11_MDL-31494_m22_adodblink' of git://github.com/skodak/moodle into...
commit13cd1994af2cee7f5acc06914fc693cc9902e9b4
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 12 Mar 2012 12:38:40 +0000 (12 13:38 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 12 Mar 2012 12:38:40 +0000 (12 13:38 +0100)
tree46e1b03b25c0864ae45eb4ed6f80ac27c4f540cb
parentb3fe3fb6c8b0b7f51d566775ead551c10a0733e5
parent4e684568328a7c0006b3db9aa02b79aaeb004186
Merge branch 'w11_MDL-31494_m22_adodblink' of git://github.com/skodak/moodle into MOODLE_22_STABLE