Merge branch 'master' of https://scm.uninett.no/rude/rude

6 jobs for master in 2 minutes and 19 seconds