Hei
Merge branch 'master' of http://github.com/eirikodal/SKS-2.0
merged med eirik
Kjetil merge
holder paa med plassering
merged henri
Remove database.shutdown() in tests
Merge branch 'master' of http://github.com/thomasSve/SKS-2.0 into henri
ferdig merga jørgen
Merge branch 'master' of http://github.com/zalox/SKS-2.0 into koeOversikt
merget med jorgie
Merge remote-tracking branch 'ted/koeOversikt' into teddybear
Merge branch 'master' of http://github.com/zalox/SKS-2.0 into koeOversikt