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)
commit0b702fca0b1d43f1adac4c8fdfb885e4ed4051b5
treec05b9255ccb80180a30150670258fd655344d2f1
parentb3245b758ce315bd505096b6a2c40641234ec6da
parentbd672f783077dd48ec1996efbe50c5bea75a9db2
Merge branch 'w23_MDL-33436_m23_testprinter' of git://github.com/skodak/moodle