Merge branch 'MDL-43025-master' of git://github.com/damyon/moodle
commit1f71f7685aef159073602302730148ce45a2663b
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 17 Dec 2013 21:58:51 +0000 (17 22:58 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 17 Dec 2013 21:58:51 +0000 (17 22:58 +0100)
treed30567fe916d02a470d1a9c6d14571473adc8b40
parent2df83c2ea891746f412b24ea1c8e7d73a4b52e5e
parent4fe9950ba6fdd6d400b709c6cb9ff7b1519decd7
Merge branch 'MDL-43025-master' of git://github.com/damyon/moodle
mod/assign/feedback/editpdf/classes/pdf.php