Merge branch 'moodleurl_out_as_local_url' of git://git.luns.net.uk/moodle