Merge branch 'MDL-52290_editpdf_pagecount' of git://github.com/davosmith/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 12 Jan 2016 04:44:17 +0000 (12:44 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 12 Jan 2016 09:31:06 +0000 (09:31 +0000)

Trivial merge