Merge branch 'pagelib_single' of git://github.com/marxjohnson/moodle