Merge branch 'w46_MDL-30228_m22_pdftestcopyright' of git://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 21 Nov 2011 00:32:55 +0000 (13:32 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 21 Nov 2011 00:32:55 +0000 (13:32 +1300)

Trivial merge