Merge branch 'w26_MDL-28117_m22_dataurlhack' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 6 Jul 2011 23:32:30 +0000 (01:32 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 6 Jul 2011 23:32:30 +0000 (01:32 +0200)
commit535a635afc3b0fb48ba8ca7ef22357ee9d4e90b0
tree2eda296f33f10d6dcf9a7287d9c501ad6a58bed4
parent482b1ea121b5746059b999c5e829efc8cca04600
parent3f8465ca4bc2b693cb93951c6a6d2c3492c6c0c0
Merge branch 'w26_MDL-28117_m22_dataurlhack' of git://github.com/skodak/moodle