Merge branch 'w23_MDL-33436_m23_testprinter' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 4 Jun 2012 17:55:21 +0000 (19:55 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 4 Jun 2012 17:55:21 +0000 (19:55 +0200)

Trivial merge