Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
smaafejl, ndriger i program - forhaabentligt ingen konflikter
merged og rettet reset