hmm
Merge branch 'master' of github.com:Fellesprosjekt/Kalender

"blablabla"
masse endringer