From: Petter Reinholdtsen Date: Wed, 14 Sep 2011 08:36:40 +0000 (+0000) Subject: Generated. X-Git-Url: https://pere.pagekite.me/gitweb/homepage.git/commitdiff_plain/923b4898cf78ff810ace3dac6439e6656f30d5f5 Generated. --- diff --git a/blog/1000_problemer_rapportert_via_FiksGataMi_p__litt_over_to_dager.html b/blog/1000_problemer_rapportert_via_FiksGataMi_p__litt_over_to_dager.html index 4100549864..c4ff4e4511 100644 --- a/blog/1000_problemer_rapportert_via_FiksGataMi_p__litt_over_to_dager.html +++ b/blog/1000_problemer_rapportert_via_FiksGataMi_p__litt_over_to_dager.html @@ -92,7 +92,11 @@ for å dyrke frem de beste løsningene. :)

  • August (6)
    • +<<<<<<< 1000_problemer_rapportert_via_FiksGataMi_p__litt_over_to_dager.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.2 @@ -206,7 +210,11 @@ for Ã¥ dyrke frem de beste løsningene. :)

  • multimedia (13)
    • +<<<<<<< 1000_problemer_rapportert_via_FiksGataMi_p__litt_over_to_dager.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.2
  • nuug (119)
    • @@ -236,8 +244,13 @@ for Ã¥ dyrke frem de beste løsningene. :)

  • surveillance (9)
    • +<<<<<<< 1000_problemer_rapportert_via_FiksGataMi_p__litt_over_to_dager.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.2
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/165_norske_overv_kningskamera_registert_s__langt_i_OpenStreetmap_org.html b/blog/165_norske_overv_kningskamera_registert_s__langt_i_OpenStreetmap_org.html index daf31a47a2..329addea47 100644 --- a/blog/165_norske_overv_kningskamera_registert_s__langt_i_OpenStreetmap_org.html +++ b/blog/165_norske_overv_kningskamera_registert_s__langt_i_OpenStreetmap_org.html @@ -72,7 +72,11 @@ kontakt slik at jeg kan fÃ¥ med ogsÃ¥ disse.

  • August (6)
    • +<<<<<<< 165_norske_overv_kningskamera_registert_s__langt_i_OpenStreetmap_org.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.2 @@ -186,7 +190,11 @@ kontakt slik at jeg kan fÃ¥ med ogsÃ¥ disse.

  • multimedia (13)
    • +<<<<<<< 165_norske_overv_kningskamera_registert_s__langt_i_OpenStreetmap_org.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.2
  • nuug (119)
    • @@ -216,8 +224,13 @@ kontakt slik at jeg kan fÃ¥ med ogsÃ¥ disse.

  • surveillance (9)
    • +<<<<<<< 165_norske_overv_kningskamera_registert_s__langt_i_OpenStreetmap_org.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.2
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/2_Spykee_roboter_i_hus__n__skal_det_lekes.html b/blog/2_Spykee_roboter_i_hus__n__skal_det_lekes.html index d533b2bacb..f6370acc38 100644 --- a/blog/2_Spykee_roboter_i_hus__n__skal_det_lekes.html +++ b/blog/2_Spykee_roboter_i_hus__n__skal_det_lekes.html @@ -78,7 +78,11 @@ firmwaren. :)

  • August (6)
    • +<<<<<<< 2_Spykee_roboter_i_hus__n__skal_det_lekes.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.2 @@ -192,7 +196,11 @@ firmwaren. :)

  • multimedia (13)
    • +<<<<<<< 2_Spykee_roboter_i_hus__n__skal_det_lekes.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.2
  • nuug (119)
    • @@ -222,8 +230,13 @@ firmwaren. :)

  • surveillance (9)
    • +<<<<<<< 2_Spykee_roboter_i_hus__n__skal_det_lekes.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.2
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/3D_printing_brer_om_seg___fabrikkene_best_r.html b/blog/3D_printing_brer_om_seg___fabrikkene_best_r.html index 5eb0634232..2df1479392 100644 --- a/blog/3D_printing_brer_om_seg___fabrikkene_best_r.html +++ b/blog/3D_printing_brer_om_seg___fabrikkene_best_r.html @@ -89,7 +89,11 @@ massemarkedet.

  • August (6)
    • +<<<<<<< 3D_printing_brer_om_seg___fabrikkene_best_r.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.2 @@ -203,7 +207,11 @@ massemarkedet.

  • multimedia (13)
    • +<<<<<<< 3D_printing_brer_om_seg___fabrikkene_best_r.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.2
  • nuug (119)
    • @@ -233,8 +241,13 @@ massemarkedet.

  • surveillance (9)
    • +<<<<<<< 3D_printing_brer_om_seg___fabrikkene_best_r.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.2
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/A_Norwegian_FixMyStreet_have_kept_me_busy_the_last_few_weeks.html b/blog/A_Norwegian_FixMyStreet_have_kept_me_busy_the_last_few_weeks.html index 4a30a7fd53..f651f5a4ff 100644 --- a/blog/A_Norwegian_FixMyStreet_have_kept_me_busy_the_last_few_weeks.html +++ b/blog/A_Norwegian_FixMyStreet_have_kept_me_busy_the_last_few_weeks.html @@ -86,7 +86,11 @@ such service?

  • August (6)
    • +<<<<<<< A_Norwegian_FixMyStreet_have_kept_me_busy_the_last_few_weeks.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.27 @@ -200,7 +204,11 @@ such service?

  • multimedia (13)
    • +<<<<<<< A_Norwegian_FixMyStreet_have_kept_me_busy_the_last_few_weeks.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.27
  • nuug (119)
    • @@ -230,8 +238,13 @@ such service?

  • surveillance (9)
    • +<<<<<<< A_Norwegian_FixMyStreet_have_kept_me_busy_the_last_few_weeks.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.27
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/A_manual_for_standards_wars___.html b/blog/A_manual_for_standards_wars___.html index bd6c0ca4db..2dba814a4f 100644 --- a/blog/A_manual_for_standards_wars___.html +++ b/blog/A_manual_for_standards_wars___.html @@ -62,7 +62,11 @@ following the standards wars of today.

  • August (6)
    • +<<<<<<< A_manual_for_standards_wars___.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.146 @@ -176,7 +180,11 @@ following the standards wars of today.

  • multimedia (13)
    • +<<<<<<< A_manual_for_standards_wars___.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.146
  • nuug (119)
    • @@ -206,8 +214,13 @@ following the standards wars of today.

  • surveillance (9)
    • +<<<<<<< A_manual_for_standards_wars___.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.146
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/After_6_years_of_waiting__the_Xreset_d_feature_is_implemented.html b/blog/After_6_years_of_waiting__the_Xreset_d_feature_is_implemented.html index 3393c1b325..9e2f4e2e81 100644 --- a/blog/After_6_years_of_waiting__the_Xreset_d_feature_is_implemented.html +++ b/blog/After_6_years_of_waiting__the_Xreset_d_feature_is_implemented.html @@ -74,7 +74,11 @@ similar to how they use the Xsession.d framework today.

  • August (6)
    • +<<<<<<< After_6_years_of_waiting__the_Xreset_d_feature_is_implemented.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.167 @@ -188,7 +192,11 @@ similar to how they use the Xsession.d framework today.

  • multimedia (13)
    • +<<<<<<< After_6_years_of_waiting__the_Xreset_d_feature_is_implemented.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.167
  • nuug (119)
    • @@ -218,8 +226,13 @@ similar to how they use the Xsession.d framework today.

  • surveillance (9)
    • +<<<<<<< After_6_years_of_waiting__the_Xreset_d_feature_is_implemented.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.167
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Amigafolket_holder_ut.html b/blog/Amigafolket_holder_ut.html index 0145ac61d4..7a2d888c3f 100644 --- a/blog/Amigafolket_holder_ut.html +++ b/blog/Amigafolket_holder_ut.html @@ -65,7 +65,11 @@ pakke. Kanskje Aros kunne vært interessant for et NUUG-foredrag?

  • August (6)
    • +<<<<<<< Amigafolket_holder_ut.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.252 @@ -179,7 +183,11 @@ pakke. Kanskje Aros kunne vært interessant for et NUUG-foredrag?

  • multimedia (13)
    • +<<<<<<< Amigafolket_holder_ut.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.252
  • nuug (119)
    • @@ -209,8 +217,13 @@ pakke. Kanskje Aros kunne vært interessant for et NUUG-foredrag?

  • surveillance (9)
    • +<<<<<<< Amigafolket_holder_ut.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.252
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Anonym_ferdsel_er_en_menneskerett.html b/blog/Anonym_ferdsel_er_en_menneskerett.html index 432c653b55..8c4822cb39 100644 --- a/blog/Anonym_ferdsel_er_en_menneskerett.html +++ b/blog/Anonym_ferdsel_er_en_menneskerett.html @@ -85,7 +85,11 @@ kollektivtrafikken i Oslo. Jeg synes det er hÃ¥rreisende.

  • August (6)
    • +<<<<<<< Anonym_ferdsel_er_en_menneskerett.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.100 @@ -199,7 +203,11 @@ kollektivtrafikken i Oslo. Jeg synes det er hÃ¥rreisende.

  • multimedia (13)
    • +<<<<<<< Anonym_ferdsel_er_en_menneskerett.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.100
  • nuug (119)
    • @@ -229,8 +237,13 @@ kollektivtrafikken i Oslo. Jeg synes det er hÃ¥rreisende.

  • surveillance (9)
    • +<<<<<<< Anonym_ferdsel_er_en_menneskerett.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.100
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Autodetecting_Client_setup_for_roaming_workstations_in_Debian_Edu.html b/blog/Autodetecting_Client_setup_for_roaming_workstations_in_Debian_Edu.html index 3b8b7e5107..65cc39680b 100644 --- a/blog/Autodetecting_Client_setup_for_roaming_workstations_in_Debian_Edu.html +++ b/blog/Autodetecting_Client_setup_for_roaming_workstations_in_Debian_Edu.html @@ -107,7 +107,11 @@ Edu, please contact us on debian-edu@lists.debian.org.

  • August (6)
    • +<<<<<<< Autodetecting_Client_setup_for_roaming_workstations_in_Debian_Edu.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.116 @@ -221,7 +225,11 @@ Edu, please contact us on debian-edu@lists.debian.org.

  • multimedia (13)
    • +<<<<<<< Autodetecting_Client_setup_for_roaming_workstations_in_Debian_Edu.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.116
  • nuug (119)
    • @@ -251,8 +259,13 @@ Edu, please contact us on debian-edu@lists.debian.org.

  • surveillance (9)
    • +<<<<<<< Autodetecting_Client_setup_for_roaming_workstations_in_Debian_Edu.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.116
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Automatic_Munin_and_Nagios_configuration.html b/blog/Automatic_Munin_and_Nagios_configuration.html index bd8a1c6348..6556c092b4 100644 --- a/blog/Automatic_Munin_and_Nagios_configuration.html +++ b/blog/Automatic_Munin_and_Nagios_configuration.html @@ -101,7 +101,11 @@ everything is taken care of.

  • August (6)
    • +<<<<<<< Automatic_Munin_and_Nagios_configuration.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.171 @@ -215,7 +219,11 @@ everything is taken care of.

  • multimedia (13)
    • +<<<<<<< Automatic_Munin_and_Nagios_configuration.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.171
  • nuug (119)
    • @@ -245,8 +253,13 @@ everything is taken care of.

  • surveillance (9)
    • +<<<<<<< Automatic_Munin_and_Nagios_configuration.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.171
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Automatic_upgrade_testing_from_Lenny_to_Squeeze.html b/blog/Automatic_upgrade_testing_from_Lenny_to_Squeeze.html index beae651664..177526182f 100644 --- a/blog/Automatic_upgrade_testing_from_Lenny_to_Squeeze.html +++ b/blog/Automatic_upgrade_testing_from_Lenny_to_Squeeze.html @@ -175,7 +175,11 @@ packages.

  • August (6)
    • +<<<<<<< Automatic_upgrade_testing_from_Lenny_to_Squeeze.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.143 @@ -289,7 +293,11 @@ packages.

  • multimedia (13)
    • +<<<<<<< Automatic_upgrade_testing_from_Lenny_to_Squeeze.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.143
  • nuug (119)
    • @@ -319,8 +327,13 @@ packages.

  • surveillance (9)
    • +<<<<<<< Automatic_upgrade_testing_from_Lenny_to_Squeeze.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.143
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Avisene_i_endring.html b/blog/Avisene_i_endring.html index 637b4b165d..af3a270525 100644 --- a/blog/Avisene_i_endring.html +++ b/blog/Avisene_i_endring.html @@ -62,7 +62,11 @@ eksisterer. Det blir spennende Ã¥ se hva vi ender opp med.

  • August (6)
    • +<<<<<<< Avisene_i_endring.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.219 @@ -176,7 +180,11 @@ eksisterer. Det blir spennende Ã¥ se hva vi ender opp med.

  • multimedia (13)
    • +<<<<<<< Avisene_i_endring.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.219
  • nuug (119)
    • @@ -206,8 +214,13 @@ eksisterer. Det blir spennende Ã¥ se hva vi ender opp med.

  • surveillance (9)
    • +<<<<<<< Avisene_i_endring.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.219
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/BSAs_p_stander_om_piratkopiering_m_ter_motstand.html b/blog/BSAs_p_stander_om_piratkopiering_m_ter_motstand.html index c1be4359bf..9b99cbe19d 100644 --- a/blog/BSAs_p_stander_om_piratkopiering_m_ter_motstand.html +++ b/blog/BSAs_p_stander_om_piratkopiering_m_ter_motstand.html @@ -83,7 +83,11 @@ pÃ¥ Slashdot.

  • August (6)
    • +<<<<<<< BSAs_p_stander_om_piratkopiering_m_ter_motstand.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.2 @@ -197,7 +201,11 @@ pÃ¥ Slashdot.

  • multimedia (13)
    • +<<<<<<< BSAs_p_stander_om_piratkopiering_m_ter_motstand.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.2
  • nuug (119)
    • @@ -227,8 +235,13 @@ pÃ¥ Slashdot.

  • surveillance (9)
    • +<<<<<<< BSAs_p_stander_om_piratkopiering_m_ter_motstand.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.2
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Bedre_kommunegrense_for_Oslo_i_OpenStreetmap_org.html b/blog/Bedre_kommunegrense_for_Oslo_i_OpenStreetmap_org.html index 6c44de9751..de622f92e0 100644 --- a/blog/Bedre_kommunegrense_for_Oslo_i_OpenStreetmap_org.html +++ b/blog/Bedre_kommunegrense_for_Oslo_i_OpenStreetmap_org.html @@ -137,7 +137,11 @@ informasjon.

  • August (6)
    • +<<<<<<< Bedre_kommunegrense_for_Oslo_i_OpenStreetmap_org.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.39 @@ -251,7 +255,11 @@ informasjon.

  • multimedia (13)
    • +<<<<<<< Bedre_kommunegrense_for_Oslo_i_OpenStreetmap_org.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.39
  • nuug (119)
    • @@ -281,8 +289,13 @@ informasjon.

  • surveillance (9)
    • +<<<<<<< Bedre_kommunegrense_for_Oslo_i_OpenStreetmap_org.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.39
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Best___ikke_fortelle_noen_at_streaming_er_nedlasting___.html b/blog/Best___ikke_fortelle_noen_at_streaming_er_nedlasting___.html index 5d371ae656..1888b7015c 100644 --- a/blog/Best___ikke_fortelle_noen_at_streaming_er_nedlasting___.html +++ b/blog/Best___ikke_fortelle_noen_at_streaming_er_nedlasting___.html @@ -197,7 +197,11 @@ NRK1. :)

  • August (6)
    • +<<<<<<< Best___ikke_fortelle_noen_at_streaming_er_nedlasting___.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.2 @@ -311,7 +315,11 @@ NRK1. :)

  • multimedia (13)
    • +<<<<<<< Best___ikke_fortelle_noen_at_streaming_er_nedlasting___.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.2
  • nuug (119)
    • @@ -341,8 +349,13 @@ NRK1. :)

  • surveillance (9)
    • +<<<<<<< Best___ikke_fortelle_noen_at_streaming_er_nedlasting___.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.2
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Bilkollektivet_vil_ha_retten_til___se_hvor_jeg_kj_rer___.html b/blog/Bilkollektivet_vil_ha_retten_til___se_hvor_jeg_kj_rer___.html index df0f84025c..5efe971efa 100644 --- a/blog/Bilkollektivet_vil_ha_retten_til___se_hvor_jeg_kj_rer___.html +++ b/blog/Bilkollektivet_vil_ha_retten_til___se_hvor_jeg_kj_rer___.html @@ -88,7 +88,11 @@ eller bare ser meg om etter alternativer.

  • August (6)
    • +<<<<<<< Bilkollektivet_vil_ha_retten_til___se_hvor_jeg_kj_rer___.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.2 @@ -202,7 +206,11 @@ eller bare ser meg om etter alternativer.

  • multimedia (13)
    • +<<<<<<< Bilkollektivet_vil_ha_retten_til___se_hvor_jeg_kj_rer___.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.2
  • nuug (119)
    • @@ -232,8 +240,13 @@ eller bare ser meg om etter alternativer.

  • surveillance (9)
    • +<<<<<<< Bilkollektivet_vil_ha_retten_til___se_hvor_jeg_kj_rer___.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.2
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Bombing_og_skyting.html b/blog/Bombing_og_skyting.html index 529720b7d8..764f8af041 100644 --- a/blog/Bombing_og_skyting.html +++ b/blog/Bombing_og_skyting.html @@ -65,7 +65,11 @@ dvs. Ã¥ gjøre samfunnet vÃ¥rt verre for innbyggerne.

  • August (6)
    • +<<<<<<< Bombing_og_skyting.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.15 @@ -179,7 +183,11 @@ dvs. Ã¥ gjøre samfunnet vÃ¥rt verre for innbyggerne.

  • multimedia (13)
    • +<<<<<<< Bombing_og_skyting.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.15
  • nuug (119)
    • @@ -209,8 +217,13 @@ dvs. Ã¥ gjøre samfunnet vÃ¥rt verre for innbyggerne.

  • surveillance (9)
    • +<<<<<<< Bombing_og_skyting.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.15
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Broken_hard_link_handling_with_sshfs.html b/blog/Broken_hard_link_handling_with_sshfs.html index 6eb1cf26bb..eca0fb092b 100644 --- a/blog/Broken_hard_link_handling_with_sshfs.html +++ b/blog/Broken_hard_link_handling_with_sshfs.html @@ -79,7 +79,11 @@ git from
  • August (6)
    • +<<<<<<< Broken_hard_link_handling_with_sshfs.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.106 @@ -193,7 +197,11 @@ git from
  • multimedia (13)
    • +<<<<<<< Broken_hard_link_handling_with_sshfs.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.106
  • nuug (119)
    • @@ -223,8 +231,13 @@ git from
  • surveillance (9)
    • +<<<<<<< Broken_hard_link_handling_with_sshfs.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.106
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Broken_umask_handling_with_sshfs.html b/blog/Broken_umask_handling_with_sshfs.html index f805cade51..a5af38c857 100644 --- a/blog/Broken_umask_handling_with_sshfs.html +++ b/blog/Broken_umask_handling_with_sshfs.html @@ -155,7 +155,11 @@ script so useful that he created a GIT repository and stored it in
  • August (6)
    • +<<<<<<< Broken_umask_handling_with_sshfs.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.111 @@ -269,7 +273,11 @@ script so useful that he created a GIT repository and stored it in
  • multimedia (13)
    • +<<<<<<< Broken_umask_handling_with_sshfs.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.111
  • nuug (119)
    • @@ -299,8 +307,13 @@ script so useful that he created a GIT repository and stored it in
  • surveillance (9)
    • +<<<<<<< Broken_umask_handling_with_sshfs.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.111
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Caching_password__user_and_group_on_a_roaming_Debian_laptop.html b/blog/Caching_password__user_and_group_on_a_roaming_Debian_laptop.html index d9e113fe05..31a5b400f9 100644 --- a/blog/Caching_password__user_and_group_on_a_roaming_Debian_laptop.html +++ b/blog/Caching_password__user_and_group_on_a_roaming_Debian_laptop.html @@ -254,7 +254,11 @@ please contact us on debian-edu@lists.debian.org.

  • August (6)
    • +<<<<<<< Caching_password__user_and_group_on_a_roaming_Debian_laptop.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.132 @@ -368,7 +372,11 @@ please contact us on debian-edu@lists.debian.org.

  • multimedia (13)
    • +<<<<<<< Caching_password__user_and_group_on_a_roaming_Debian_laptop.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.132
  • nuug (119)
    • @@ -398,8 +406,13 @@ please contact us on debian-edu@lists.debian.org.

  • surveillance (9)
    • +<<<<<<< Caching_password__user_and_group_on_a_roaming_Debian_laptop.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.132
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Calling_tasksel_like_the_installer__while_still_getting_useful_output.html b/blog/Calling_tasksel_like_the_installer__while_still_getting_useful_output.html index 630a02665a..095a289521 100644 --- a/blog/Calling_tasksel_like_the_installer__while_still_getting_useful_output.html +++ b/blog/Calling_tasksel_like_the_installer__while_still_getting_useful_output.html @@ -97,7 +97,11 @@ like this.

  • August (6)
    • +<<<<<<< Calling_tasksel_like_the_installer__while_still_getting_useful_output.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.135 @@ -211,7 +215,11 @@ like this.

  • multimedia (13)
    • +<<<<<<< Calling_tasksel_like_the_installer__while_still_getting_useful_output.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.135
  • nuug (119)
    • @@ -241,8 +249,13 @@ like this.

  • surveillance (9)
    • +<<<<<<< Calling_tasksel_like_the_installer__while_still_getting_useful_output.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.135
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Checking_server_hardware_support_status_for_Dell__HP_and_IBM_servers.html b/blog/Checking_server_hardware_support_status_for_Dell__HP_and_IBM_servers.html index c3767a7f38..5a964d8aa6 100644 --- a/blog/Checking_server_hardware_support_status_for_Dell__HP_and_IBM_servers.html +++ b/blog/Checking_server_hardware_support_status_for_Dell__HP_and_IBM_servers.html @@ -216,7 +216,11 @@ do so.

  • August (6)
    • +<<<<<<< Checking_server_hardware_support_status_for_Dell__HP_and_IBM_servers.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.227 @@ -330,7 +334,11 @@ do so.

  • multimedia (13)
    • +<<<<<<< Checking_server_hardware_support_status_for_Dell__HP_and_IBM_servers.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.227
  • nuug (119)
    • @@ -360,8 +368,13 @@ do so.

  • surveillance (9)
    • +<<<<<<< Checking_server_hardware_support_status_for_Dell__HP_and_IBM_servers.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.227
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Chrome_plan_to_drop_H_264_support_for_HTML5__lt_video_gt_.html b/blog/Chrome_plan_to_drop_H_264_support_for_HTML5__lt_video_gt_.html index f8090121b7..91015a1c85 100644 --- a/blog/Chrome_plan_to_drop_H_264_support_for_HTML5__lt_video_gt_.html +++ b/blog/Chrome_plan_to_drop_H_264_support_for_HTML5__lt_video_gt_.html @@ -130,7 +130,11 @@ background and information on the move it a blog post yesterday.

  • August (6)
    • +<<<<<<< Chrome_plan_to_drop_H_264_support_for_HTML5__lt_video_gt_.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.49 @@ -244,7 +248,11 @@ background and information on the move it a blog post yesterday.

  • multimedia (13)
    • +<<<<<<< Chrome_plan_to_drop_H_264_support_for_HTML5__lt_video_gt_.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.49
  • nuug (119)
    • @@ -274,8 +282,13 @@ background and information on the move it a blog post yesterday.

  • surveillance (9)
    • +<<<<<<< Chrome_plan_to_drop_H_264_support_for_HTML5__lt_video_gt_.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.49
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Circular_package_dependencies_harms_apt_recovery.html b/blog/Circular_package_dependencies_harms_apt_recovery.html index 3fee146d3a..5d0db5c4b1 100644 --- a/blog/Circular_package_dependencies_harms_apt_recovery.html +++ b/blog/Circular_package_dependencies_harms_apt_recovery.html @@ -104,7 +104,11 @@ it.

  • August (6)
    • +<<<<<<< Circular_package_dependencies_harms_apt_recovery.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.118 @@ -218,7 +222,11 @@ it.

  • multimedia (13)
    • +<<<<<<< Circular_package_dependencies_harms_apt_recovery.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.118
  • nuug (119)
    • @@ -248,8 +256,13 @@ it.

  • surveillance (9)
    • +<<<<<<< Circular_package_dependencies_harms_apt_recovery.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.118
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Combining_PowerDNS_and_ISC_DHCP_LDAP_objects.html b/blog/Combining_PowerDNS_and_ISC_DHCP_LDAP_objects.html index abf4f56b5c..42d0dab0e8 100644 --- a/blog/Combining_PowerDNS_and_ISC_DHCP_LDAP_objects.html +++ b/blog/Combining_PowerDNS_and_ISC_DHCP_LDAP_objects.html @@ -113,7 +113,11 @@ please contact us on debian-edu@lists.debian.org.

  • August (6)
    • +<<<<<<< Combining_PowerDNS_and_ISC_DHCP_LDAP_objects.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.125 @@ -227,7 +231,11 @@ please contact us on debian-edu@lists.debian.org.

  • multimedia (13)
    • +<<<<<<< Combining_PowerDNS_and_ISC_DHCP_LDAP_objects.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.125
  • nuug (119)
    • @@ -257,8 +265,13 @@ please contact us on debian-edu@lists.debian.org.

  • surveillance (9)
    • +<<<<<<< Combining_PowerDNS_and_ISC_DHCP_LDAP_objects.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.125
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/DND_hedrer_overv_kning_av_barn_med_Rosingsprisen.html b/blog/DND_hedrer_overv_kning_av_barn_med_Rosingsprisen.html index e9aaf36d95..b7e44fa6d4 100644 --- a/blog/DND_hedrer_overv_kning_av_barn_med_Rosingsprisen.html +++ b/blog/DND_hedrer_overv_kning_av_barn_med_Rosingsprisen.html @@ -93,7 +93,11 @@ lese alle de tre bøkene.

  • August (6)
    • +<<<<<<< DND_hedrer_overv_kning_av_barn_med_Rosingsprisen.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.4 @@ -207,7 +211,11 @@ lese alle de tre bøkene.

  • multimedia (13)
    • +<<<<<<< DND_hedrer_overv_kning_av_barn_med_Rosingsprisen.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.4
  • nuug (119)
    • @@ -237,8 +245,13 @@ lese alle de tre bøkene.

  • surveillance (9)
    • +<<<<<<< DND_hedrer_overv_kning_av_barn_med_Rosingsprisen.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.4
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Danmark_g_r_for_ODF_.html b/blog/Danmark_g_r_for_ODF_.html index 706a149890..d567c7abf5 100644 --- a/blog/Danmark_g_r_for_ODF_.html +++ b/blog/Danmark_g_r_for_ODF_.html @@ -72,7 +72,11 @@ platforme.

  • August (6)
    • +<<<<<<< Danmark_g_r_for_ODF_.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.2 @@ -186,7 +190,11 @@ platforme.

  • multimedia (13)
    • +<<<<<<< Danmark_g_r_for_ODF_.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.2
  • nuug (119)
    • @@ -216,8 +224,13 @@ platforme.

  • surveillance (9)
    • +<<<<<<< Danmark_g_r_for_ODF_.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.2
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Datalagringsdirektivet__et_angrep_p__demokratiet.html b/blog/Datalagringsdirektivet__et_angrep_p__demokratiet.html index d8d43efb67..348aa2ffd7 100644 --- a/blog/Datalagringsdirektivet__et_angrep_p__demokratiet.html +++ b/blog/Datalagringsdirektivet__et_angrep_p__demokratiet.html @@ -110,7 +110,11 @@ fra Stopp DLD-organisasjonen for mer informasjon om dette.

  • August (6)
    • +<<<<<<< Datalagringsdirektivet__et_angrep_p__demokratiet.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.4 @@ -224,7 +228,11 @@ fra Stopp DLD-organisasjonen for mer informasjon om dette.

  • multimedia (13)
    • +<<<<<<< Datalagringsdirektivet__et_angrep_p__demokratiet.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.4
  • nuug (119)
    • @@ -254,8 +262,13 @@ fra Stopp DLD-organisasjonen for mer informasjon om dette.

  • surveillance (9)
    • +<<<<<<< Datalagringsdirektivet__et_angrep_p__demokratiet.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.4
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Datatilsynet_mangler_verkt_yet_som_trengs_for___kontrollere_kameraoverv_kning.html b/blog/Datatilsynet_mangler_verkt_yet_som_trengs_for___kontrollere_kameraoverv_kning.html index 55f4d054bd..9d5c3a5aa0 100644 --- a/blog/Datatilsynet_mangler_verkt_yet_som_trengs_for___kontrollere_kameraoverv_kning.html +++ b/blog/Datatilsynet_mangler_verkt_yet_som_trengs_for___kontrollere_kameraoverv_kning.html @@ -168,7 +168,11 @@ ting, sÃ¥ et slikt lovverk i Norge tror jeg hadde vært nyttig.

  • August (6)
    • +<<<<<<< Datatilsynet_mangler_verkt_yet_som_trengs_for___kontrollere_kameraoverv_kning.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.2 @@ -282,7 +286,11 @@ ting, sÃ¥ et slikt lovverk i Norge tror jeg hadde vært nyttig.

  • multimedia (13)
    • +<<<<<<< Datatilsynet_mangler_verkt_yet_som_trengs_for___kontrollere_kameraoverv_kning.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.2
  • nuug (119)
    • @@ -312,8 +320,13 @@ ting, sÃ¥ et slikt lovverk i Norge tror jeg hadde vært nyttig.

  • surveillance (9)
    • +<<<<<<< Datatilsynet_mangler_verkt_yet_som_trengs_for___kontrollere_kameraoverv_kning.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.2
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Datatilsynet_svarer_om_Bilkollektivets__nske_om_GPS_sporing.html b/blog/Datatilsynet_svarer_om_Bilkollektivets__nske_om_GPS_sporing.html index f9b31ddfb6..dab56eaad4 100644 --- a/blog/Datatilsynet_svarer_om_Bilkollektivets__nske_om_GPS_sporing.html +++ b/blog/Datatilsynet_svarer_om_Bilkollektivets__nske_om_GPS_sporing.html @@ -155,7 +155,11 @@ dagene, eller om jeg bare finner et annet alternativ.

  • August (6)
    • +<<<<<<< Datatilsynet_svarer_om_Bilkollektivets__nske_om_GPS_sporing.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.4 @@ -269,7 +273,11 @@ dagene, eller om jeg bare finner et annet alternativ.

  • multimedia (13)
    • +<<<<<<< Datatilsynet_svarer_om_Bilkollektivets__nske_om_GPS_sporing.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.4
  • nuug (119)
    • @@ -299,8 +307,13 @@ dagene, eller om jeg bare finner et annet alternativ.

  • surveillance (9)
    • +<<<<<<< Datatilsynet_svarer_om_Bilkollektivets__nske_om_GPS_sporing.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.4
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Debian_Edu___Skolelinux_based_on_Lenny_released__work_continues.html b/blog/Debian_Edu___Skolelinux_based_on_Lenny_released__work_continues.html index 5f8fa0ebc9..eec2ff6f15 100644 --- a/blog/Debian_Edu___Skolelinux_based_on_Lenny_released__work_continues.html +++ b/blog/Debian_Edu___Skolelinux_based_on_Lenny_released__work_continues.html @@ -70,7 +70,11 @@ and have just a few weeks or months to make it happen.

  • August (6)
    • +<<<<<<< Debian_Edu___Skolelinux_based_on_Lenny_released__work_continues.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.169 @@ -184,7 +188,11 @@ and have just a few weeks or months to make it happen.

  • multimedia (13)
    • +<<<<<<< Debian_Edu___Skolelinux_based_on_Lenny_released__work_continues.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.169
  • nuug (119)
    • @@ -214,8 +222,13 @@ and have just a few weeks or months to make it happen.

  • surveillance (9)
    • +<<<<<<< Debian_Edu___Skolelinux_based_on_Lenny_released__work_continues.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.169
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Debian_Edu_development_gathering_and_General_Assembly_for_FRiSK.html b/blog/Debian_Edu_development_gathering_and_General_Assembly_for_FRiSK.html index 52ec710bb1..2548893833 100644 --- a/blog/Debian_Edu_development_gathering_and_General_Assembly_for_FRiSK.html +++ b/blog/Debian_Edu_development_gathering_and_General_Assembly_for_FRiSK.html @@ -71,7 +71,11 @@ vote this year.

  • August (6)
    • +<<<<<<< Debian_Edu_development_gathering_and_General_Assembly_for_FRiSK.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.72 @@ -185,7 +189,11 @@ vote this year.

  • multimedia (13)
    • +<<<<<<< Debian_Edu_development_gathering_and_General_Assembly_for_FRiSK.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.72
  • nuug (119)
    • @@ -215,8 +223,13 @@ vote this year.

  • surveillance (9)
    • +<<<<<<< Debian_Edu_development_gathering_and_General_Assembly_for_FRiSK.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.72
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Debian_Edu_roaming_workstation___at_the_university_of_Oslo.html b/blog/Debian_Edu_roaming_workstation___at_the_university_of_Oslo.html index 71e8644c84..37f086e3ae 100644 --- a/blog/Debian_Edu_roaming_workstation___at_the_university_of_Oslo.html +++ b/blog/Debian_Edu_roaming_workstation___at_the_university_of_Oslo.html @@ -86,7 +86,11 @@ uses.

  • August (6)
    • +<<<<<<< Debian_Edu_roaming_workstation___at_the_university_of_Oslo.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.117 @@ -200,7 +204,11 @@ uses.

  • multimedia (13)
    • +<<<<<<< Debian_Edu_roaming_workstation___at_the_university_of_Oslo.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.117
  • nuug (119)
    • @@ -230,8 +238,13 @@ uses.

  • surveillance (9)
    • +<<<<<<< Debian_Edu_roaming_workstation___at_the_university_of_Oslo.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.117
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Debian_boots_quicker_and_quicker.html b/blog/Debian_boots_quicker_and_quicker.html index 887b9cf9f8..20a6242883 100644 --- a/blog/Debian_boots_quicker_and_quicker.html +++ b/blog/Debian_boots_quicker_and_quicker.html @@ -102,7 +102,11 @@ insserv'. Will need to test if that work. :)

  • August (6)
    • +<<<<<<< Debian_boots_quicker_and_quicker.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.192 @@ -216,7 +220,11 @@ insserv'. Will need to test if that work. :)

  • multimedia (13)
    • +<<<<<<< Debian_boots_quicker_and_quicker.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.192
  • nuug (119)
    • @@ -246,8 +254,13 @@ insserv'. Will need to test if that work. :)

  • surveillance (9)
    • +<<<<<<< Debian_boots_quicker_and_quicker.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.192
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Debian_has_switched_to_dependency_based_boot_sequencing.html b/blog/Debian_has_switched_to_dependency_based_boot_sequencing.html index bb6974c74f..42c7564406 100644 --- a/blog/Debian_has_switched_to_dependency_based_boot_sequencing.html +++ b/blog/Debian_has_switched_to_dependency_based_boot_sequencing.html @@ -67,7 +67,11 @@ non-predictable kernel in the early boot.

  • August (6)
    • +<<<<<<< Debian_has_switched_to_dependency_based_boot_sequencing.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.187 @@ -181,7 +185,11 @@ non-predictable kernel in the early boot.

  • multimedia (13)
    • +<<<<<<< Debian_has_switched_to_dependency_based_boot_sequencing.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.187
  • nuug (119)
    • @@ -211,8 +219,13 @@ non-predictable kernel in the early boot.

  • surveillance (9)
    • +<<<<<<< Debian_has_switched_to_dependency_based_boot_sequencing.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.187
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Debian_in_3D.html b/blog/Debian_in_3D.html index 4422dc736a..1ffbfdcc59 100644 --- a/blog/Debian_in_3D.html +++ b/blog/Debian_in_3D.html @@ -62,7 +62,11 @@ thingiverse blog.

  • August (6)
    • +<<<<<<< Debian_in_3D.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.82 @@ -176,7 +180,11 @@ thingiverse blog.

  • multimedia (13)
    • +<<<<<<< Debian_in_3D.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.82
  • nuug (119)
    • @@ -206,8 +214,13 @@ thingiverse blog.

  • surveillance (9)
    • +<<<<<<< Debian_in_3D.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.82
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Det_totalit_re_samfunn_kommer_stadig_n_rmere.html b/blog/Det_totalit_re_samfunn_kommer_stadig_n_rmere.html index 15ec67b375..de55be24cd 100644 --- a/blog/Det_totalit_re_samfunn_kommer_stadig_n_rmere.html +++ b/blog/Det_totalit_re_samfunn_kommer_stadig_n_rmere.html @@ -102,7 +102,11 @@ ta kontakt slik at jeg kan fÃ¥ med ogsÃ¥ disse.

  • August (6)
    • +<<<<<<< Det_totalit_re_samfunn_kommer_stadig_n_rmere.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.2 @@ -216,7 +220,11 @@ ta kontakt slik at jeg kan fÃ¥ med ogsÃ¥ disse.

  • multimedia (13)
    • +<<<<<<< Det_totalit_re_samfunn_kommer_stadig_n_rmere.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.2
  • nuug (119)
    • @@ -246,8 +254,13 @@ ta kontakt slik at jeg kan fÃ¥ med ogsÃ¥ disse.

  • surveillance (9)
    • +<<<<<<< Det_totalit_re_samfunn_kommer_stadig_n_rmere.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.2
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Det_vanskelige_Lisensvalget___ikke_lag_din_egen.html b/blog/Det_vanskelige_Lisensvalget___ikke_lag_din_egen.html index 0be9e36aaf..c60359b84c 100644 --- a/blog/Det_vanskelige_Lisensvalget___ikke_lag_din_egen.html +++ b/blog/Det_vanskelige_Lisensvalget___ikke_lag_din_egen.html @@ -152,7 +152,11 @@ og endrer pÃ¥ betingelsene.

  • August (6)
    • +<<<<<<< Det_vanskelige_Lisensvalget___ikke_lag_din_egen.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.243 @@ -266,7 +270,11 @@ og endrer pÃ¥ betingelsene.

  • multimedia (13)
    • +<<<<<<< Det_vanskelige_Lisensvalget___ikke_lag_din_egen.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.243
  • nuug (119)
    • @@ -296,8 +304,13 @@ og endrer pÃ¥ betingelsene.

  • surveillance (9)
    • +<<<<<<< Det_vanskelige_Lisensvalget___ikke_lag_din_egen.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.243
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Devcamp_brought_us_closer_to_the_Lenny_based_Debian_Edu_release.html b/blog/Devcamp_brought_us_closer_to_the_Lenny_based_Debian_Edu_release.html index 1d1a6fba2b..44973e0ee8 100644 --- a/blog/Devcamp_brought_us_closer_to_the_Lenny_based_Debian_Edu_release.html +++ b/blog/Devcamp_brought_us_closer_to_the_Lenny_based_Debian_Edu_release.html @@ -70,7 +70,11 @@ of these cards.

  • August (6)
    • +<<<<<<< Devcamp_brought_us_closer_to_the_Lenny_based_Debian_Edu_release.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.248 @@ -184,7 +188,11 @@ of these cards.

  • multimedia (13)
    • +<<<<<<< Devcamp_brought_us_closer_to_the_Lenny_based_Debian_Edu_release.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.248
  • nuug (119)
    • @@ -214,8 +222,13 @@ of these cards.

  • surveillance (9)
    • +<<<<<<< Devcamp_brought_us_closer_to_the_Lenny_based_Debian_Edu_release.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.248
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Digitale_b_ker_uten_digitale_restriksjonsmekanismer__DRM__b_r_f__mva_fritak.html b/blog/Digitale_b_ker_uten_digitale_restriksjonsmekanismer__DRM__b_r_f__mva_fritak.html index 0ab1c44c5f..34e452c0fa 100644 --- a/blog/Digitale_b_ker_uten_digitale_restriksjonsmekanismer__DRM__b_r_f__mva_fritak.html +++ b/blog/Digitale_b_ker_uten_digitale_restriksjonsmekanismer__DRM__b_r_f__mva_fritak.html @@ -87,7 +87,11 @@ der for Ã¥ se hva de har.
  • August (6)
    • +<<<<<<< Digitale_b_ker_uten_digitale_restriksjonsmekanismer__DRM__b_r_f__mva_fritak.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.2 @@ -201,7 +205,11 @@ der for Ã¥ se hva de har.
  • multimedia (13)
    • +<<<<<<< Digitale_b_ker_uten_digitale_restriksjonsmekanismer__DRM__b_r_f__mva_fritak.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.2
  • nuug (119)
    • @@ -231,8 +239,13 @@ der for Ã¥ se hva de har.
  • surveillance (9)
    • +<<<<<<< Digitale_b_ker_uten_digitale_restriksjonsmekanismer__DRM__b_r_f__mva_fritak.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.2
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Digitale_restriksjonsmekanismer_fikk_meg_til___slutte___kj_pe_musikk.html b/blog/Digitale_restriksjonsmekanismer_fikk_meg_til___slutte___kj_pe_musikk.html index 14b82ce54e..0a9a0ed04e 100644 --- a/blog/Digitale_restriksjonsmekanismer_fikk_meg_til___slutte___kj_pe_musikk.html +++ b/blog/Digitale_restriksjonsmekanismer_fikk_meg_til___slutte___kj_pe_musikk.html @@ -79,7 +79,11 @@ Kommer neppe til Ã¥ ta i bruk Blueray, og ei heller de nye DRM-greiene
  • August (6)
    • +<<<<<<< Digitale_restriksjonsmekanismer_fikk_meg_til___slutte___kj_pe_musikk.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.2 @@ -193,7 +197,11 @@ Kommer neppe til Ã¥ ta i bruk Blueray, og ei heller de nye DRM-greiene
  • multimedia (13)
    • +<<<<<<< Digitale_restriksjonsmekanismer_fikk_meg_til___slutte___kj_pe_musikk.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.2
  • nuug (119)
    • @@ -223,8 +231,13 @@ Kommer neppe til Ã¥ ta i bruk Blueray, og ei heller de nye DRM-greiene
  • surveillance (9)
    • +<<<<<<< Digitale_restriksjonsmekanismer_fikk_meg_til___slutte___kj_pe_musikk.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.2
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/EU_parlamentet_raner_fellesskapet_for_musikk.html b/blog/EU_parlamentet_raner_fellesskapet_for_musikk.html index 779f70938f..2d3e478547 100644 --- a/blog/EU_parlamentet_raner_fellesskapet_for_musikk.html +++ b/blog/EU_parlamentet_raner_fellesskapet_for_musikk.html @@ -75,7 +75,11 @@ uten musikk med bruksbegresninger.

  • August (6)
    • +<<<<<<< EU_parlamentet_raner_fellesskapet_for_musikk.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.205 @@ -189,7 +193,11 @@ uten musikk med bruksbegresninger.

  • multimedia (13)
    • +<<<<<<< EU_parlamentet_raner_fellesskapet_for_musikk.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.205
  • nuug (119)
    • @@ -219,8 +227,13 @@ uten musikk med bruksbegresninger.

  • surveillance (9)
    • +<<<<<<< EU_parlamentet_raner_fellesskapet_for_musikk.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.205
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Elektronikkbyggesettet_for_reprapen_sporet_opp.html b/blog/Elektronikkbyggesettet_for_reprapen_sporet_opp.html index b451bdbd40..a488c583bd 100644 --- a/blog/Elektronikkbyggesettet_for_reprapen_sporet_opp.html +++ b/blog/Elektronikkbyggesettet_for_reprapen_sporet_opp.html @@ -72,7 +72,11 @@ jul.

  • August (6)
    • +<<<<<<< Elektronikkbyggesettet_for_reprapen_sporet_opp.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.246 @@ -186,7 +190,11 @@ jul.

  • multimedia (13)
    • +<<<<<<< Elektronikkbyggesettet_for_reprapen_sporet_opp.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.246
  • nuug (119)
    • @@ -216,8 +224,13 @@ jul.

  • surveillance (9)
    • +<<<<<<< Elektronikkbyggesettet_for_reprapen_sporet_opp.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.246
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Elektronikkbyggesettet_kommer_fram_p__andre_fors_k.html b/blog/Elektronikkbyggesettet_kommer_fram_p__andre_fors_k.html index 3dd32cf2c4..2cb81e652b 100644 --- a/blog/Elektronikkbyggesettet_kommer_fram_p__andre_fors_k.html +++ b/blog/Elektronikkbyggesettet_kommer_fram_p__andre_fors_k.html @@ -95,7 +95,11 @@ pÃ¥stÃ¥r det skulle skje i 2008.

  • August (6)
    • +<<<<<<< Elektronikkbyggesettet_kommer_fram_p__andre_fors_k.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.2 @@ -209,7 +213,11 @@ pÃ¥stÃ¥r det skulle skje i 2008.

  • multimedia (13)
    • +<<<<<<< Elektronikkbyggesettet_kommer_fram_p__andre_fors_k.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.2
  • nuug (119)
    • @@ -239,8 +247,13 @@ pÃ¥stÃ¥r det skulle skje i 2008.

  • surveillance (9)
    • +<<<<<<< Elektronikkbyggesettet_kommer_fram_p__andre_fors_k.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.2
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Elektronisk_stemmegiving_er_ikke_til___stole_p____heller_ikke_i_Norge.html b/blog/Elektronisk_stemmegiving_er_ikke_til___stole_p____heller_ikke_i_Norge.html index f4349bb598..23b3d9a1eb 100644 --- a/blog/Elektronisk_stemmegiving_er_ikke_til___stole_p____heller_ikke_i_Norge.html +++ b/blog/Elektronisk_stemmegiving_er_ikke_til___stole_p____heller_ikke_i_Norge.html @@ -94,7 +94,11 @@ elektronisk stemmegiving og unngÃ¥ begrepet "evalg".

  • August (6)
    • +<<<<<<< Elektronisk_stemmegiving_er_ikke_til___stole_p____heller_ikke_i_Norge.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.2 @@ -208,7 +212,11 @@ elektronisk stemmegiving og unngÃ¥ begrepet "evalg".

  • multimedia (13)
    • +<<<<<<< Elektronisk_stemmegiving_er_ikke_til___stole_p____heller_ikke_i_Norge.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.2
  • nuug (119)
    • @@ -238,8 +246,13 @@ elektronisk stemmegiving og unngÃ¥ begrepet "evalg".

  • surveillance (9)
    • +<<<<<<< Elektronisk_stemmegiving_er_ikke_til___stole_p____heller_ikke_i_Norge.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.2
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Elektronisk_stemmegiving_over_Internet_og_datalagringsdirektivet.html b/blog/Elektronisk_stemmegiving_over_Internet_og_datalagringsdirektivet.html index 7a63b90767..f6304f0501 100644 --- a/blog/Elektronisk_stemmegiving_over_Internet_og_datalagringsdirektivet.html +++ b/blog/Elektronisk_stemmegiving_over_Internet_og_datalagringsdirektivet.html @@ -114,7 +114,11 @@ systemet som ikke kan kontrolleres av hver enkelt innbygger.

  • August (6)
    • +<<<<<<< Elektronisk_stemmegiving_over_Internet_og_datalagringsdirektivet.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.7 @@ -228,7 +232,11 @@ systemet som ikke kan kontrolleres av hver enkelt innbygger.

  • multimedia (13)
    • +<<<<<<< Elektronisk_stemmegiving_over_Internet_og_datalagringsdirektivet.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.7
  • nuug (119)
    • @@ -258,8 +266,13 @@ systemet som ikke kan kontrolleres av hver enkelt innbygger.

  • surveillance (9)
    • +<<<<<<< Elektronisk_stemmegiving_over_Internet_og_datalagringsdirektivet.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.7
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/En_skam_at_det_ikke_finnes_ordrett_referat_fra_norske_domstoler.html b/blog/En_skam_at_det_ikke_finnes_ordrett_referat_fra_norske_domstoler.html index fe5ca4670b..4bf0fa611e 100644 --- a/blog/En_skam_at_det_ikke_finnes_ordrett_referat_fra_norske_domstoler.html +++ b/blog/En_skam_at_det_ikke_finnes_ordrett_referat_fra_norske_domstoler.html @@ -80,7 +80,11 @@ publisert offentlig pÃ¥ web.

  • August (6)
    • +<<<<<<< En_skam_at_det_ikke_finnes_ordrett_referat_fra_norske_domstoler.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.220 @@ -194,7 +198,11 @@ publisert offentlig pÃ¥ web.

  • multimedia (13)
    • +<<<<<<< En_skam_at_det_ikke_finnes_ordrett_referat_fra_norske_domstoler.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.220
  • nuug (119)
    • @@ -224,8 +232,13 @@ publisert offentlig pÃ¥ web.

  • surveillance (9)
    • +<<<<<<< En_skam_at_det_ikke_finnes_ordrett_referat_fra_norske_domstoler.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.220
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Endelig_er_Debian_Lenny_gitt_ut.html b/blog/Endelig_er_Debian_Lenny_gitt_ut.html index a37a1a57b3..de756c6e0e 100644 --- a/blog/Endelig_er_Debian_Lenny_gitt_ut.html +++ b/blog/Endelig_er_Debian_Lenny_gitt_ut.html @@ -68,7 +68,11 @@ bootsekvens tilgjengelig i stabil utgave, vha pakken
  • August (6)
    • +<<<<<<< Endelig_er_Debian_Lenny_gitt_ut.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.229 @@ -182,7 +186,11 @@ bootsekvens tilgjengelig i stabil utgave, vha pakken
  • multimedia (13)
    • +<<<<<<< Endelig_er_Debian_Lenny_gitt_ut.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.229
  • nuug (119)
    • @@ -212,8 +220,13 @@ bootsekvens tilgjengelig i stabil utgave, vha pakken
  • surveillance (9)
    • +<<<<<<< Endelig_er_Debian_Lenny_gitt_ut.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.229
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Endelig_norsk_stavekontroll_med_st_tte_for_ord_med_bindestrek.html b/blog/Endelig_norsk_stavekontroll_med_st_tte_for_ord_med_bindestrek.html index 0c2b15851d..f30bb2cb64 100644 --- a/blog/Endelig_norsk_stavekontroll_med_st_tte_for_ord_med_bindestrek.html +++ b/blog/Endelig_norsk_stavekontroll_med_st_tte_for_ord_med_bindestrek.html @@ -79,7 +79,11 @@ stavekontrollen.

  • August (6)
    • +<<<<<<< Endelig_norsk_stavekontroll_med_st_tte_for_ord_med_bindestrek.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.2 @@ -193,7 +197,11 @@ stavekontrollen.

  • multimedia (13)
    • +<<<<<<< Endelig_norsk_stavekontroll_med_st_tte_for_ord_med_bindestrek.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.2
  • nuug (119)
    • @@ -223,8 +231,13 @@ stavekontrollen.

  • surveillance (9)
    • +<<<<<<< Endelig_norsk_stavekontroll_med_st_tte_for_ord_med_bindestrek.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.2
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Endelig_operativt_webbasert_medlemsregister_for_Fri_programvare_i_skolen.html b/blog/Endelig_operativt_webbasert_medlemsregister_for_Fri_programvare_i_skolen.html index 836ad5062f..98b4d9fb39 100644 --- a/blog/Endelig_operativt_webbasert_medlemsregister_for_Fri_programvare_i_skolen.html +++ b/blog/Endelig_operativt_webbasert_medlemsregister_for_Fri_programvare_i_skolen.html @@ -72,7 +72,11 @@ GNU.
  • August (6)
    • +<<<<<<< Endelig_operativt_webbasert_medlemsregister_for_Fri_programvare_i_skolen.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.178 @@ -186,7 +190,11 @@ GNU.
  • multimedia (13)
    • +<<<<<<< Endelig_operativt_webbasert_medlemsregister_for_Fri_programvare_i_skolen.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.178
  • nuug (119)
    • @@ -216,8 +224,13 @@ GNU.
  • surveillance (9)
    • +<<<<<<< Endelig_operativt_webbasert_medlemsregister_for_Fri_programvare_i_skolen.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.178
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Et_bilde_p__problemet_med_programvarepatenter.html b/blog/Et_bilde_p__problemet_med_programvarepatenter.html index 4ea3d0d9a7..c12d57b647 100644 --- a/blog/Et_bilde_p__problemet_med_programvarepatenter.html +++ b/blog/Et_bilde_p__problemet_med_programvarepatenter.html @@ -70,7 +70,11 @@ temaet. Alle er hjertelig velkomne som abonnenter.

  • August (6)
    • +<<<<<<< Et_bilde_p__problemet_med_programvarepatenter.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.2 @@ -184,7 +188,11 @@ temaet. Alle er hjertelig velkomne som abonnenter.

  • multimedia (13)
    • +<<<<<<< Et_bilde_p__problemet_med_programvarepatenter.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.2
  • nuug (119)
    • @@ -214,8 +222,13 @@ temaet. Alle er hjertelig velkomne som abonnenter.

  • surveillance (9)
    • +<<<<<<< Et_bilde_p__problemet_med_programvarepatenter.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.2
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Experimental_Open311_API_for_the_mySociety_fixmystreet_system.html b/blog/Experimental_Open311_API_for_the_mySociety_fixmystreet_system.html index c3493273a3..6a9e597aab 100644 --- a/blog/Experimental_Open311_API_for_the_mySociety_fixmystreet_system.html +++ b/blog/Experimental_Open311_API_for_the_mySociety_fixmystreet_system.html @@ -72,7 +72,11 @@ to have a look. Please send feedback to the
  • August (6)
    • +<<<<<<< Experimental_Open311_API_for_the_mySociety_fixmystreet_system.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.21 @@ -186,7 +190,11 @@ to have a look. Please send feedback to the
  • multimedia (13)
    • +<<<<<<< Experimental_Open311_API_for_the_mySociety_fixmystreet_system.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.21
  • nuug (119)
    • @@ -216,8 +224,13 @@ to have a look. Please send feedback to the
  • surveillance (9)
    • +<<<<<<< Experimental_Open311_API_for_the_mySociety_fixmystreet_system.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.21
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/FAD_lanserer_reiseregningsskjema_som_fri_programvare.html b/blog/FAD_lanserer_reiseregningsskjema_som_fri_programvare.html index 7551e4829d..3b033ef66c 100644 --- a/blog/FAD_lanserer_reiseregningsskjema_som_fri_programvare.html +++ b/blog/FAD_lanserer_reiseregningsskjema_som_fri_programvare.html @@ -133,7 +133,11 @@ gjorde det litt vanskeligere for brukeren.

  • August (6)
    • +<<<<<<< FAD_lanserer_reiseregningsskjema_som_fri_programvare.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.245 @@ -247,7 +251,11 @@ gjorde det litt vanskeligere for brukeren.

  • multimedia (13)
    • +<<<<<<< FAD_lanserer_reiseregningsskjema_som_fri_programvare.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.245
  • nuug (119)
    • @@ -277,8 +285,13 @@ gjorde det litt vanskeligere for brukeren.

  • surveillance (9)
    • +<<<<<<< FAD_lanserer_reiseregningsskjema_som_fri_programvare.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.245
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/F_rste_NUUG_fordrag_sendt_p__TV.html b/blog/F_rste_NUUG_fordrag_sendt_p__TV.html index e52b151d1d..4f2577389f 100644 --- a/blog/F_rste_NUUG_fordrag_sendt_p__TV.html +++ b/blog/F_rste_NUUG_fordrag_sendt_p__TV.html @@ -73,7 +73,11 @@ meg, Tollef og alle andre de som deltok pÃ¥ møtet pÃ¥ TV.

  • August (6)
    • +<<<<<<< F_rste_NUUG_fordrag_sendt_p__TV.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.2 @@ -187,7 +191,11 @@ meg, Tollef og alle andre de som deltok pÃ¥ møtet pÃ¥ TV.

  • multimedia (13)
    • +<<<<<<< F_rste_NUUG_fordrag_sendt_p__TV.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.2
  • nuug (119)
    • @@ -217,8 +225,13 @@ meg, Tollef og alle andre de som deltok pÃ¥ møtet pÃ¥ TV.

  • surveillance (9)
    • +<<<<<<< F_rste_NUUG_fordrag_sendt_p__TV.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.2
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/F_rste_reprap_integreringsfors_k___Z_aksen_beveger_seg.html b/blog/F_rste_reprap_integreringsfors_k___Z_aksen_beveger_seg.html index c3fc6ea5f2..bf9f5f8548 100644 --- a/blog/F_rste_reprap_integreringsfors_k___Z_aksen_beveger_seg.html +++ b/blog/F_rste_reprap_integreringsfors_k___Z_aksen_beveger_seg.html @@ -87,7 +87,11 @@ limet egentlig heter, sÃ¥ det er vanskelig Ã¥ søke pÃ¥ nett.

  • August (6)
    • +<<<<<<< F_rste_reprap_integreringsfors_k___Z_aksen_beveger_seg.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.2 @@ -201,7 +205,11 @@ limet egentlig heter, sÃ¥ det er vanskelig Ã¥ søke pÃ¥ nett.

  • multimedia (13)
    • +<<<<<<< F_rste_reprap_integreringsfors_k___Z_aksen_beveger_seg.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.2
  • nuug (119)
    • @@ -231,8 +239,13 @@ limet egentlig heter, sÃ¥ det er vanskelig Ã¥ søke pÃ¥ nett.

  • surveillance (9)
    • +<<<<<<< F_rste_reprap_integreringsfors_k___Z_aksen_beveger_seg.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.2
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/F_rste_vellykkede_videostr_m_fra_NUUG.html b/blog/F_rste_vellykkede_videostr_m_fra_NUUG.html index c3ef0762b3..315cafe39a 100644 --- a/blog/F_rste_vellykkede_videostr_m_fra_NUUG.html +++ b/blog/F_rste_vellykkede_videostr_m_fra_NUUG.html @@ -66,7 +66,11 @@ webserver og komprimert.

  • August (6)
    • +<<<<<<< F_rste_vellykkede_videostr_m_fra_NUUG.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.2 @@ -180,7 +184,11 @@ webserver og komprimert.

  • multimedia (13)
    • +<<<<<<< F_rste_vellykkede_videostr_m_fra_NUUG.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.2
  • nuug (119)
    • @@ -210,8 +218,13 @@ webserver og komprimert.

  • surveillance (9)
    • +<<<<<<< F_rste_vellykkede_videostr_m_fra_NUUG.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.2
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/FiksGataMi___fylkesoversikt_p__kart.html b/blog/FiksGataMi___fylkesoversikt_p__kart.html index c183031cbb..b37b216db1 100644 --- a/blog/FiksGataMi___fylkesoversikt_p__kart.html +++ b/blog/FiksGataMi___fylkesoversikt_p__kart.html @@ -92,7 +92,11 @@ navnene fra %20 til %2B, slik at de fungerer i flere nettlesere.

  • August (6)
    • +<<<<<<< FiksGataMi___fylkesoversikt_p__kart.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.2 @@ -206,7 +210,11 @@ navnene fra %20 til %2B, slik at de fungerer i flere nettlesere.

  • multimedia (13)
    • +<<<<<<< FiksGataMi___fylkesoversikt_p__kart.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.2
  • nuug (119)
    • @@ -236,8 +244,13 @@ navnene fra %20 til %2B, slik at de fungerer i flere nettlesere.

  • surveillance (9)
    • +<<<<<<< FiksGataMi___fylkesoversikt_p__kart.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.2
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/FiksGataMi_lansert__og_responsen_har_v_rt_overveldende.html b/blog/FiksGataMi_lansert__og_responsen_har_v_rt_overveldende.html index b3eed82ae8..59d6fb9e09 100644 --- a/blog/FiksGataMi_lansert__og_responsen_har_v_rt_overveldende.html +++ b/blog/FiksGataMi_lansert__og_responsen_har_v_rt_overveldende.html @@ -114,7 +114,11 @@ ses kanskje der?

  • August (6)
    • +<<<<<<< FiksGataMi_lansert__og_responsen_har_v_rt_overveldende.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.2 @@ -228,7 +232,11 @@ ses kanskje der?

  • multimedia (13)
    • +<<<<<<< FiksGataMi_lansert__og_responsen_har_v_rt_overveldende.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.2
  • nuug (119)
    • @@ -258,8 +266,13 @@ ses kanskje der?

  • surveillance (9)
    • +<<<<<<< FiksGataMi_lansert__og_responsen_har_v_rt_overveldende.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.2
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Fiksgatami_begynner___ta_form.html b/blog/Fiksgatami_begynner___ta_form.html index 3f83498f0a..d60daafde4 100644 --- a/blog/Fiksgatami_begynner___ta_form.html +++ b/blog/Fiksgatami_begynner___ta_form.html @@ -74,7 +74,11 @@ med dem. Dette blir bra.

  • August (6)
    • +<<<<<<< Fiksgatami_begynner___ta_form.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.2 @@ -188,7 +192,11 @@ med dem. Dette blir bra.

  • multimedia (13)
    • +<<<<<<< Fiksgatami_begynner___ta_form.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.2
  • nuug (119)
    • @@ -218,8 +226,13 @@ med dem. Dette blir bra.

  • surveillance (9)
    • +<<<<<<< Fiksgatami_begynner___ta_form.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.2
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Fiksgatami_tar_form___snart_klar_for_test.html b/blog/Fiksgatami_tar_form___snart_klar_for_test.html index 7237187bc7..d9b5b67eaf 100644 --- a/blog/Fiksgatami_tar_form___snart_klar_for_test.html +++ b/blog/Fiksgatami_tar_form___snart_klar_for_test.html @@ -103,7 +103,11 @@ epostadresse for innsender, og det tror jeg vi skal fortsette med.

  • August (6)
    • +<<<<<<< Fiksgatami_tar_form___snart_klar_for_test.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.39 @@ -217,7 +221,11 @@ epostadresse for innsender, og det tror jeg vi skal fortsette med.

  • multimedia (13)
    • +<<<<<<< Fiksgatami_tar_form___snart_klar_for_test.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.39
  • nuug (119)
    • @@ -247,8 +255,13 @@ epostadresse for innsender, og det tror jeg vi skal fortsette med.

  • surveillance (9)
    • +<<<<<<< Fiksgatami_tar_form___snart_klar_for_test.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.39
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Fildeling_er_lovlig___ulovlig_fildeling_er_ulovlig.html b/blog/Fildeling_er_lovlig___ulovlig_fildeling_er_ulovlig.html index c326d2e533..d070829d1f 100644 --- a/blog/Fildeling_er_lovlig___ulovlig_fildeling_er_ulovlig.html +++ b/blog/Fildeling_er_lovlig___ulovlig_fildeling_er_ulovlig.html @@ -72,7 +72,11 @@ og fildeling av slike filer er fullt ut lovlig.

  • August (6)
    • +<<<<<<< Fildeling_er_lovlig___ulovlig_fildeling_er_ulovlig.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.210 @@ -186,7 +190,11 @@ og fildeling av slike filer er fullt ut lovlig.

  • multimedia (13)
    • +<<<<<<< Fildeling_er_lovlig___ulovlig_fildeling_er_ulovlig.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.210
  • nuug (119)
    • @@ -216,8 +224,13 @@ og fildeling av slike filer er fullt ut lovlig.

  • surveillance (9)
    • +<<<<<<< Fildeling_er_lovlig___ulovlig_fildeling_er_ulovlig.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.210
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Fin_minnemarkering_p__Stortinget_i_dag.html b/blog/Fin_minnemarkering_p__Stortinget_i_dag.html index 616af677be..3a9d25a7bc 100644 --- a/blog/Fin_minnemarkering_p__Stortinget_i_dag.html +++ b/blog/Fin_minnemarkering_p__Stortinget_i_dag.html @@ -79,7 +79,11 @@ og bør aldri glemmes.

  • August (6)
    • +<<<<<<< Fin_minnemarkering_p__Stortinget_i_dag.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.2 @@ -193,7 +197,11 @@ og bør aldri glemmes.

  • multimedia (13)
    • +<<<<<<< Fin_minnemarkering_p__Stortinget_i_dag.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.2
  • nuug (119)
    • @@ -223,8 +231,13 @@ og bør aldri glemmes.

  • surveillance (9)
    • +<<<<<<< Fin_minnemarkering_p__Stortinget_i_dag.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.2
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Fint_at_milit_ret_ikke_ble_aktivisert_22__juli.html b/blog/Fint_at_milit_ret_ikke_ble_aktivisert_22__juli.html index c83075c93d..b50fe2ca40 100644 --- a/blog/Fint_at_milit_ret_ikke_ble_aktivisert_22__juli.html +++ b/blog/Fint_at_milit_ret_ikke_ble_aktivisert_22__juli.html @@ -72,7 +72,11 @@ tropper. Jeg tror det er en vesentlig forskjell.

  • August (6)
    • +<<<<<<< Fint_at_milit_ret_ikke_ble_aktivisert_22__juli.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.2 @@ -186,7 +190,11 @@ tropper. Jeg tror det er en vesentlig forskjell.

  • multimedia (13)
    • +<<<<<<< Fint_at_milit_ret_ikke_ble_aktivisert_22__juli.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.2
  • nuug (119)
    • @@ -216,8 +224,13 @@ tropper. Jeg tror det er en vesentlig forskjell.

  • surveillance (9)
    • +<<<<<<< Fint_at_milit_ret_ikke_ble_aktivisert_22__juli.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.2
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/First_Debian_Edu_test_release__alpha0__based_on_Squeeze_is_released.html b/blog/First_Debian_Edu_test_release__alpha0__based_on_Squeeze_is_released.html index d58c3fae5f..026f905147 100644 --- a/blog/First_Debian_Edu_test_release__alpha0__based_on_Squeeze_is_released.html +++ b/blog/First_Debian_Edu_test_release__alpha0__based_on_Squeeze_is_released.html @@ -167,7 +167,11 @@ http://wiki.debian.org/DebianEdu/HowTo/ReportBugsInBugzilla

  • August (6)
    • +<<<<<<< First_Debian_Edu_test_release__alpha0__based_on_Squeeze_is_released.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.119 @@ -281,7 +285,11 @@ http://wiki.debian.org/DebianEdu/HowTo/ReportBugsInBugzilla

  • multimedia (13)
    • +<<<<<<< First_Debian_Edu_test_release__alpha0__based_on_Squeeze_is_released.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.119
  • nuug (119)
    • @@ -311,8 +319,13 @@ http://wiki.debian.org/DebianEdu/HowTo/ReportBugsInBugzilla

  • surveillance (9)
    • +<<<<<<< First_Debian_Edu_test_release__alpha0__based_on_Squeeze_is_released.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.119
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/First_version_of_a_Perl_library_to_control_the_Spykee_robot.html b/blog/First_version_of_a_Perl_library_to_control_the_Spykee_robot.html index f41b126096..89210ec30f 100644 --- a/blog/First_version_of_a_Perl_library_to_control_the_Spykee_robot.html +++ b/blog/First_version_of_a_Perl_library_to_control_the_Spykee_robot.html @@ -85,7 +85,11 @@ please let me know.

  • August (6)
    • +<<<<<<< First_version_of_a_Perl_library_to_control_the_Spykee_robot.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.94 @@ -199,7 +203,11 @@ please let me know.

  • multimedia (13)
    • +<<<<<<< First_version_of_a_Perl_library_to_control_the_Spykee_robot.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.94
  • nuug (119)
    • @@ -229,8 +237,13 @@ please let me know.

  • surveillance (9)
    • +<<<<<<< First_version_of_a_Perl_library_to_control_the_Spykee_robot.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.94
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Flytting_er_et_tidssluk.html b/blog/Flytting_er_et_tidssluk.html index 17b3296b89..975df5fd80 100644 --- a/blog/Flytting_er_et_tidssluk.html +++ b/blog/Flytting_er_et_tidssluk.html @@ -65,7 +65,11 @@ Jeg hÃ¥per det blir bedre etter flytting i oktober.

  • August (6)
    • +<<<<<<< Flytting_er_et_tidssluk.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.4 @@ -179,7 +183,11 @@ Jeg hÃ¥per det blir bedre etter flytting i oktober.

  • multimedia (13)
    • +<<<<<<< Flytting_er_et_tidssluk.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.4
  • nuug (119)
    • @@ -209,8 +217,13 @@ Jeg hÃ¥per det blir bedre etter flytting i oktober.

  • surveillance (9)
    • +<<<<<<< Flytting_er_et_tidssluk.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.4
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Forcing_new_users_to_change_their_password_on_first_login.html b/blog/Forcing_new_users_to_change_their_password_on_first_login.html index 627ae5d665..d3297db2dc 100644 --- a/blog/Forcing_new_users_to_change_their_password_on_first_login.html +++ b/blog/Forcing_new_users_to_change_their_password_on_first_login.html @@ -126,7 +126,11 @@ change.

  • August (6)
    • +<<<<<<< Forcing_new_users_to_change_their_password_on_first_login.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.165 @@ -240,7 +244,11 @@ change.

  • multimedia (13)
    • +<<<<<<< Forcing_new_users_to_change_their_password_on_first_login.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.165
  • nuug (119)
    • @@ -270,8 +278,13 @@ change.

  • surveillance (9)
    • +<<<<<<< Forcing_new_users_to_change_their_password_on_first_login.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.165
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Forslag_i_stortinget_om___stoppe_elektronisk_stemmegiving_i_Norge.html b/blog/Forslag_i_stortinget_om___stoppe_elektronisk_stemmegiving_i_Norge.html index 9dc6dedb6f..91c82d3aa5 100644 --- a/blog/Forslag_i_stortinget_om___stoppe_elektronisk_stemmegiving_i_Norge.html +++ b/blog/Forslag_i_stortinget_om___stoppe_elektronisk_stemmegiving_i_Norge.html @@ -64,7 +64,11 @@ er fremmet av Erna Solberg, Michael Tetzschner og Trond Helleland.

  • August (6)
    • +<<<<<<< Forslag_i_stortinget_om___stoppe_elektronisk_stemmegiving_i_Norge.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.2 @@ -178,7 +182,11 @@ er fremmet av Erna Solberg, Michael Tetzschner og Trond Helleland.

  • multimedia (13)
    • +<<<<<<< Forslag_i_stortinget_om___stoppe_elektronisk_stemmegiving_i_Norge.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.2
  • nuug (119)
    • @@ -208,8 +216,13 @@ er fremmet av Erna Solberg, Michael Tetzschner og Trond Helleland.

  • surveillance (9)
    • +<<<<<<< Forslag_i_stortinget_om___stoppe_elektronisk_stemmegiving_i_Norge.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.2
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Fransk_idiotlovforslag_hinker_gjennom_parlamentet.html b/blog/Fransk_idiotlovforslag_hinker_gjennom_parlamentet.html index 7e03af2c4c..3d8715a023 100644 --- a/blog/Fransk_idiotlovforslag_hinker_gjennom_parlamentet.html +++ b/blog/Fransk_idiotlovforslag_hinker_gjennom_parlamentet.html @@ -71,7 +71,11 @@ rettet mot seg.

  • August (6)
    • +<<<<<<< Fransk_idiotlovforslag_hinker_gjennom_parlamentet.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.212 @@ -185,7 +189,11 @@ rettet mot seg.

  • multimedia (13)
    • +<<<<<<< Fransk_idiotlovforslag_hinker_gjennom_parlamentet.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.212
  • nuug (119)
    • @@ -215,8 +223,13 @@ rettet mot seg.

  • surveillance (9)
    • +<<<<<<< Fransk_idiotlovforslag_hinker_gjennom_parlamentet.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.212
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Free_Software_vs__proprietary_softare___.html b/blog/Free_Software_vs__proprietary_softare___.html index 51788c4f16..f6b0124e9b 100644 --- a/blog/Free_Software_vs__proprietary_softare___.html +++ b/blog/Free_Software_vs__proprietary_softare___.html @@ -66,7 +66,11 @@ the time to read their content, the terms are simply unacceptable.

  • August (6)
    • +<<<<<<< Free_Software_vs__proprietary_softare___.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.17 @@ -180,7 +184,11 @@ the time to read their content, the terms are simply unacceptable.

  • multimedia (13)
    • +<<<<<<< Free_Software_vs__proprietary_softare___.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.17
  • nuug (119)
    • @@ -210,8 +218,13 @@ the time to read their content, the terms are simply unacceptable.

  • surveillance (9)
    • +<<<<<<< Free_Software_vs__proprietary_softare___.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.17
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Fri_og__pen_standard__slik_Digistan_ser_det.html b/blog/Fri_og__pen_standard__slik_Digistan_ser_det.html index b232a4ca4f..a88c0e8f5d 100644 --- a/blog/Fri_og__pen_standard__slik_Digistan_ser_det.html +++ b/blog/Fri_og__pen_standard__slik_Digistan_ser_det.html @@ -107,7 +107,11 @@ produkter basert pÃ¥ standarden.

  • August (6)
    • +<<<<<<< Fri_og__pen_standard__slik_Digistan_ser_det.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.2 @@ -221,7 +225,11 @@ produkter basert pÃ¥ standarden.

  • multimedia (13)
    • +<<<<<<< Fri_og__pen_standard__slik_Digistan_ser_det.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.2
  • nuug (119)
    • @@ -251,8 +259,13 @@ produkter basert pÃ¥ standarden.

  • surveillance (9)
    • +<<<<<<< Fri_og__pen_standard__slik_Digistan_ser_det.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.2
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Frikanalen_og_jul_i_studentr_det.html b/blog/Frikanalen_og_jul_i_studentr_det.html index a20535ade6..6ce7e5b323 100644 --- a/blog/Frikanalen_og_jul_i_studentr_det.html +++ b/blog/Frikanalen_og_jul_i_studentr_det.html @@ -95,7 +95,11 @@ NUUG lykkes med Ã¥ fÃ¥ ut sine opptak med like stor suksess.

  • August (6)
    • +<<<<<<< Frikanalen_og_jul_i_studentr_det.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.2 @@ -209,7 +213,11 @@ NUUG lykkes med Ã¥ fÃ¥ ut sine opptak med like stor suksess.

  • multimedia (13)
    • +<<<<<<< Frikanalen_og_jul_i_studentr_det.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.2
  • nuug (119)
    • @@ -239,8 +247,13 @@ NUUG lykkes med Ã¥ fÃ¥ ut sine opptak med like stor suksess.

  • surveillance (9)
    • +<<<<<<< Frikanalen_og_jul_i_studentr_det.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.2
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Gjendikte_sangen__Copying_Is_Not_Theft__p__Norsk_.html b/blog/Gjendikte_sangen__Copying_Is_Not_Theft__p__Norsk_.html index 2b5f410731..e0bc644b8a 100644 --- a/blog/Gjendikte_sangen__Copying_Is_Not_Theft__p__Norsk_.html +++ b/blog/Gjendikte_sangen__Copying_Is_Not_Theft__p__Norsk_.html @@ -121,7 +121,11 @@ til Ã¥ fÃ¥ denne sangen over i norsk sprÃ¥kdrakt, ta kontakt med video
  • August (6)
    • +<<<<<<< Gjendikte_sangen__Copying_Is_Not_Theft__p__Norsk_.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.4 @@ -235,7 +239,11 @@ til Ã¥ fÃ¥ denne sangen over i norsk sprÃ¥kdrakt, ta kontakt med video
  • multimedia (13)
    • +<<<<<<< Gjendikte_sangen__Copying_Is_Not_Theft__p__Norsk_.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.4
  • nuug (119)
    • @@ -265,8 +273,13 @@ til Ã¥ fÃ¥ denne sangen over i norsk sprÃ¥kdrakt, ta kontakt med video
  • surveillance (9)
    • +<<<<<<< Gjendikte_sangen__Copying_Is_Not_Theft__p__Norsk_.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.4
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Gnash_buildbot_slave_and_Debian_kfreebsd.html b/blog/Gnash_buildbot_slave_and_Debian_kfreebsd.html index dc1d59ae0f..2507cefc8d 100644 --- a/blog/Gnash_buildbot_slave_and_Debian_kfreebsd.html +++ b/blog/Gnash_buildbot_slave_and_Debian_kfreebsd.html @@ -79,7 +79,11 @@ gnash buildbot slave on the Debian Edu/Skolelinux this weekend.

  • August (6)
    • +<<<<<<< Gnash_buildbot_slave_and_Debian_kfreebsd.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.79 @@ -193,7 +197,11 @@ gnash buildbot slave on the Debian Edu/Skolelinux this weekend.

  • multimedia (13)
    • +<<<<<<< Gnash_buildbot_slave_and_Debian_kfreebsd.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.79
  • nuug (119)
    • @@ -223,8 +231,13 @@ gnash buildbot slave on the Debian Edu/Skolelinux this weekend.

  • surveillance (9)
    • +<<<<<<< Gnash_buildbot_slave_and_Debian_kfreebsd.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.79
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Gnash_enteres_Google_Summer_of_Code_2011.html b/blog/Gnash_enteres_Google_Summer_of_Code_2011.html index 0e088cadb6..54dd8446d0 100644 --- a/blog/Gnash_enteres_Google_Summer_of_Code_2011.html +++ b/blog/Gnash_enteres_Google_Summer_of_Code_2011.html @@ -63,7 +63,11 @@ into Gnash.

  • August (6)
    • +<<<<<<< Gnash_enteres_Google_Summer_of_Code_2011.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.26 @@ -177,7 +181,11 @@ into Gnash.

  • multimedia (13)
    • +<<<<<<< Gnash_enteres_Google_Summer_of_Code_2011.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.26
  • nuug (119)
    • @@ -207,8 +215,13 @@ into Gnash.

  • surveillance (9)
    • +<<<<<<< Gnash_enteres_Google_Summer_of_Code_2011.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.26
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Great_book___Content__Selected_Essays_on_Technology__Creativity__Copyright__and_the_Future_of_the_Future_.html b/blog/Great_book___Content__Selected_Essays_on_Technology__Creativity__Copyright__and_the_Future_of_the_Future_.html index 859477ceda..f44db326a7 100644 --- a/blog/Great_book___Content__Selected_Essays_on_Technology__Creativity__Copyright__and_the_Future_of_the_Future_.html +++ b/blog/Great_book___Content__Selected_Essays_on_Technology__Creativity__Copyright__and_the_Future_of_the_Future_.html @@ -68,7 +68,11 @@ strongly recommend this book.

  • August (6)
    • +<<<<<<< Great_book___Content__Selected_Essays_on_Technology__Creativity__Copyright__and_the_Future_of_the_Future_.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.164 @@ -182,7 +186,11 @@ strongly recommend this book.

  • multimedia (13)
    • +<<<<<<< Great_book___Content__Selected_Essays_on_Technology__Creativity__Copyright__and_the_Future_of_the_Future_.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.164
  • nuug (119)
    • @@ -212,8 +220,13 @@ strongly recommend this book.

  • surveillance (9)
    • +<<<<<<< Great_book___Content__Selected_Essays_on_Technology__Creativity__Copyright__and_the_Future_of_the_Future_.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.164
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/How_is_booting_into_runlevel_1_different_from_single_user_boots_.html b/blog/How_is_booting_into_runlevel_1_different_from_single_user_boots_.html index 4d7bc7f164..7906faf911 100644 --- a/blog/How_is_booting_into_runlevel_1_different_from_single_user_boots_.html +++ b/blog/How_is_booting_into_runlevel_1_different_from_single_user_boots_.html @@ -115,7 +115,11 @@ from when sysvinit was introduced into Debian, a long time ago.

  • August (6)
    • +<<<<<<< How_is_booting_into_runlevel_1_different_from_single_user_boots_.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.8 @@ -229,7 +233,11 @@ from when sysvinit was introduced into Debian, a long time ago.

  • multimedia (13)
    • +<<<<<<< How_is_booting_into_runlevel_1_different_from_single_user_boots_.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.8
  • nuug (119)
    • @@ -259,8 +267,13 @@ from when sysvinit was introduced into Debian, a long time ago.

  • surveillance (9)
    • +<<<<<<< How_is_booting_into_runlevel_1_different_from_single_user_boots_.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.8
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/How_to_test_if_a_laptop_is_working_with_Linux.html b/blog/How_to_test_if_a_laptop_is_working_with_Linux.html index 457af767e6..bf07b8fc83 100644 --- a/blog/How_to_test_if_a_laptop_is_working_with_Linux.html +++ b/blog/How_to_test_if_a_laptop_is_working_with_Linux.html @@ -141,7 +141,11 @@ RHEL6 with glxgears. No idea why.

  • August (6)
    • +<<<<<<< How_to_test_if_a_laptop_is_working_with_Linux.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.66 @@ -255,7 +259,11 @@ RHEL6 with glxgears. No idea why.

  • multimedia (13)
    • +<<<<<<< How_to_test_if_a_laptop_is_working_with_Linux.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.66
  • nuug (119)
    • @@ -285,8 +293,13 @@ RHEL6 with glxgears. No idea why.

  • surveillance (9)
    • +<<<<<<< How_to_test_if_a_laptop_is_working_with_Linux.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.66
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Hva_er_egentlig_en__pen_standard_.html b/blog/Hva_er_egentlig_en__pen_standard_.html index 8158c0c256..5286e4f5a2 100644 --- a/blog/Hva_er_egentlig_en__pen_standard_.html +++ b/blog/Hva_er_egentlig_en__pen_standard_.html @@ -154,7 +154,11 @@ av en standard for at en standard skal kunne kalles fri og Ã¥pen.

  • August (6)
    • +<<<<<<< Hva_er_egentlig_en__pen_standard_.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.2 @@ -268,7 +272,11 @@ av en standard for at en standard skal kunne kalles fri og Ã¥pen.

  • multimedia (13)
    • +<<<<<<< Hva_er_egentlig_en__pen_standard_.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.2
  • nuug (119)
    • @@ -298,8 +306,13 @@ av en standard for at en standard skal kunne kalles fri og Ã¥pen.

  • surveillance (9)
    • +<<<<<<< Hva_er_egentlig_en__pen_standard_.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.2
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Hva_har_mine_representanter_stemt_i_Storinget_.html b/blog/Hva_har_mine_representanter_stemt_i_Storinget_.html index 61e4842962..3d8300a3ea 100644 --- a/blog/Hva_har_mine_representanter_stemt_i_Storinget_.html +++ b/blog/Hva_har_mine_representanter_stemt_i_Storinget_.html @@ -129,7 +129,11 @@ at vi i NUUG har fÃ¥tt operativ en norsk utgave av
  • August (6)
    • +<<<<<<< Hva_har_mine_representanter_stemt_i_Storinget_.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.51 @@ -243,7 +247,11 @@ at vi i NUUG har fÃ¥tt operativ en norsk utgave av
  • multimedia (13)
    • +<<<<<<< Hva_har_mine_representanter_stemt_i_Storinget_.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.51
  • nuug (119)
    • @@ -273,8 +281,13 @@ at vi i NUUG har fÃ¥tt operativ en norsk utgave av
  • surveillance (9)
    • +<<<<<<< Hva_har_mine_representanter_stemt_i_Storinget_.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.51
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Hva_utgj_r_en_vellykket_offentlig_tjeneste_.html b/blog/Hva_utgj_r_en_vellykket_offentlig_tjeneste_.html index 76ce1accb2..1b338cd784 100644 --- a/blog/Hva_utgj_r_en_vellykket_offentlig_tjeneste_.html +++ b/blog/Hva_utgj_r_en_vellykket_offentlig_tjeneste_.html @@ -105,7 +105,11 @@ flest mulig klarer Ã¥ bidra til Ã¥ forbedre offentlig infrastruktur.

  • August (6)
    • +<<<<<<< Hva_utgj_r_en_vellykket_offentlig_tjeneste_.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.4 @@ -219,7 +223,11 @@ flest mulig klarer Ã¥ bidra til Ã¥ forbedre offentlig infrastruktur.

  • multimedia (13)
    • +<<<<<<< Hva_utgj_r_en_vellykket_offentlig_tjeneste_.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.4
  • nuug (119)
    • @@ -249,8 +257,13 @@ flest mulig klarer Ã¥ bidra til Ã¥ forbedre offentlig infrastruktur.

  • surveillance (9)
    • +<<<<<<< Hva_utgj_r_en_vellykket_offentlig_tjeneste_.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.4
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Hvem_stemte_hva_p__Stortinget_.html b/blog/Hvem_stemte_hva_p__Stortinget_.html index f053fe2638..fbc13d2206 100644 --- a/blog/Hvem_stemte_hva_p__Stortinget_.html +++ b/blog/Hvem_stemte_hva_p__Stortinget_.html @@ -107,7 +107,11 @@ utviklingstimer for Ã¥ tilpasse eksisterende portal til norsk.

  • August (6)
    • +<<<<<<< Hvem_stemte_hva_p__Stortinget_.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.2 @@ -221,7 +225,11 @@ utviklingstimer for Ã¥ tilpasse eksisterende portal til norsk.

  • multimedia (13)
    • +<<<<<<< Hvem_stemte_hva_p__Stortinget_.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.2
  • nuug (119)
    • @@ -251,8 +259,13 @@ utviklingstimer for Ã¥ tilpasse eksisterende portal til norsk.

  • surveillance (9)
    • +<<<<<<< Hvem_stemte_hva_p__Stortinget_.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.2
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Hvor_flyter_Microsofts_penger_.html b/blog/Hvor_flyter_Microsofts_penger_.html index e78d5268df..06fb87a685 100644 --- a/blog/Hvor_flyter_Microsofts_penger_.html +++ b/blog/Hvor_flyter_Microsofts_penger_.html @@ -81,7 +81,11 @@ om spaniaselskapet pÃ¥ spansk, men jeg kan ikke lese spansk. :(

  • August (6)
    • +<<<<<<< Hvor_flyter_Microsofts_penger_.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.205 @@ -195,7 +199,11 @@ om spaniaselskapet pÃ¥ spansk, men jeg kan ikke lese spansk. :(

  • multimedia (13)
    • +<<<<<<< Hvor_flyter_Microsofts_penger_.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.205
  • nuug (119)
    • @@ -225,8 +233,13 @@ om spaniaselskapet pÃ¥ spansk, men jeg kan ikke lese spansk. :(

  • surveillance (9)
    • +<<<<<<< Hvor_flyter_Microsofts_penger_.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.205
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Hvordan_kringkaster_T_banen_i_Oslo_sine_overv_kningskamerasignaler_.html b/blog/Hvordan_kringkaster_T_banen_i_Oslo_sine_overv_kningskamerasignaler_.html index 6e204b63c4..91cc8bca51 100644 --- a/blog/Hvordan_kringkaster_T_banen_i_Oslo_sine_overv_kningskamerasignaler_.html +++ b/blog/Hvordan_kringkaster_T_banen_i_Oslo_sine_overv_kningskamerasignaler_.html @@ -93,7 +93,11 @@ kraftigere scanner. :)

  • August (6)
    • +<<<<<<< Hvordan_kringkaster_T_banen_i_Oslo_sine_overv_kningskamerasignaler_.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.2 @@ -207,7 +211,11 @@ kraftigere scanner. :)

  • multimedia (13)
    • +<<<<<<< Hvordan_kringkaster_T_banen_i_Oslo_sine_overv_kningskamerasignaler_.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.2
  • nuug (119)
    • @@ -237,8 +245,13 @@ kraftigere scanner. :)

  • surveillance (9)
    • +<<<<<<< Hvordan_kringkaster_T_banen_i_Oslo_sine_overv_kningskamerasignaler_.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.2
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Hvorfor_jeg_ikke_bruker_eFaktura.html b/blog/Hvorfor_jeg_ikke_bruker_eFaktura.html index b8cca6a59f..f2d6c2b5dd 100644 --- a/blog/Hvorfor_jeg_ikke_bruker_eFaktura.html +++ b/blog/Hvorfor_jeg_ikke_bruker_eFaktura.html @@ -84,7 +84,11 @@ liker rett og slett ikke dagens faktureringsmodeller.

  • August (6)
    • +<<<<<<< Hvorfor_jeg_ikke_bruker_eFaktura.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.206 @@ -198,7 +202,11 @@ liker rett og slett ikke dagens faktureringsmodeller.

  • multimedia (13)
    • +<<<<<<< Hvorfor_jeg_ikke_bruker_eFaktura.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.206
  • nuug (119)
    • @@ -228,8 +236,13 @@ liker rett og slett ikke dagens faktureringsmodeller.

  • surveillance (9)
    • +<<<<<<< Hvorfor_jeg_ikke_bruker_eFaktura.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.206
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/IDG_mener_linux_i_servermarkedet_vil_vokse_med_21__i_2009.html b/blog/IDG_mener_linux_i_servermarkedet_vil_vokse_med_21__i_2009.html index 3680a3c2e0..0b515e9a82 100644 --- a/blog/IDG_mener_linux_i_servermarkedet_vil_vokse_med_21__i_2009.html +++ b/blog/IDG_mener_linux_i_servermarkedet_vil_vokse_med_21__i_2009.html @@ -64,7 +64,11 @@ bakgrunnskunnskapen kan jeg godt tro at IDG er inne pÃ¥ noe.

  • August (6)
    • +<<<<<<< IDG_mener_linux_i_servermarkedet_vil_vokse_med_21__i_2009.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.200 @@ -178,7 +182,11 @@ bakgrunnskunnskapen kan jeg godt tro at IDG er inne pÃ¥ noe.

  • multimedia (13)
    • +<<<<<<< IDG_mener_linux_i_servermarkedet_vil_vokse_med_21__i_2009.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.200
  • nuug (119)
    • @@ -208,8 +216,13 @@ bakgrunnskunnskapen kan jeg godt tro at IDG er inne pÃ¥ noe.

  • surveillance (9)
    • +<<<<<<< IDG_mener_linux_i_servermarkedet_vil_vokse_med_21__i_2009.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.200
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/ISO_still_hope_to_fix_OOXML.html b/blog/ISO_still_hope_to_fix_OOXML.html index d894de26b2..f456dbc324 100644 --- a/blog/ISO_still_hope_to_fix_OOXML.html +++ b/blog/ISO_still_hope_to_fix_OOXML.html @@ -71,7 +71,11 @@ seminar this autumn.

  • August (6)
    • +<<<<<<< ISO_still_hope_to_fix_OOXML.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.185 @@ -185,7 +189,11 @@ seminar this autumn.

  • multimedia (13)
    • +<<<<<<< ISO_still_hope_to_fix_OOXML.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.185
  • nuug (119)
    • @@ -215,8 +223,13 @@ seminar this autumn.

  • surveillance (9)
    • +<<<<<<< ISO_still_hope_to_fix_OOXML.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.185
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/I_dag_skal_Stortinget_votere_over_datalagringsdirektivet.html b/blog/I_dag_skal_Stortinget_votere_over_datalagringsdirektivet.html index cf526303e7..caa1f19ba6 100644 --- a/blog/I_dag_skal_Stortinget_votere_over_datalagringsdirektivet.html +++ b/blog/I_dag_skal_Stortinget_votere_over_datalagringsdirektivet.html @@ -170,7 +170,11 @@ er noen aktuelle lenker, bÃ¥de nye og gamle:

  • August (6)
    • +<<<<<<< I_dag_skal_Stortinget_votere_over_datalagringsdirektivet.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.26 @@ -284,7 +288,11 @@ er noen aktuelle lenker, bÃ¥de nye og gamle:

  • multimedia (13)
    • +<<<<<<< I_dag_skal_Stortinget_votere_over_datalagringsdirektivet.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.26
  • nuug (119)
    • @@ -314,8 +322,13 @@ er noen aktuelle lenker, bÃ¥de nye og gamle:

  • surveillance (9)
    • +<<<<<<< I_dag_skal_Stortinget_votere_over_datalagringsdirektivet.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.26
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Idea_for_a_change_to_LDAP_schemas_allowing_DNS_and_DHCP_info_to_be_combined_into_one_object.html b/blog/Idea_for_a_change_to_LDAP_schemas_allowing_DNS_and_DHCP_info_to_be_combined_into_one_object.html index 302d278323..675c96163b 100644 --- a/blog/Idea_for_a_change_to_LDAP_schemas_allowing_DNS_and_DHCP_info_to_be_combined_into_one_object.html +++ b/blog/Idea_for_a_change_to_LDAP_schemas_allowing_DNS_and_DHCP_info_to_be_combined_into_one_object.html @@ -98,7 +98,11 @@ please contact us on debian-edu@lists.debian.org.

  • August (6)
    • +<<<<<<< Idea_for_a_change_to_LDAP_schemas_allowing_DNS_and_DHCP_info_to_be_combined_into_one_object.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.135 @@ -212,7 +216,11 @@ please contact us on debian-edu@lists.debian.org.

  • multimedia (13)
    • +<<<<<<< Idea_for_a_change_to_LDAP_schemas_allowing_DNS_and_DHCP_info_to_be_combined_into_one_object.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.135
  • nuug (119)
    • @@ -242,8 +250,13 @@ please contact us on debian-edu@lists.debian.org.

  • surveillance (9)
    • +<<<<<<< Idea_for_a_change_to_LDAP_schemas_allowing_DNS_and_DHCP_info_to_be_combined_into_one_object.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.135
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Idea_for_storing_LTSP_configuration_in_LDAP.html b/blog/Idea_for_storing_LTSP_configuration_in_LDAP.html index 2b91d713d0..80489b78ef 100644 --- a/blog/Idea_for_storing_LTSP_configuration_in_LDAP.html +++ b/blog/Idea_for_storing_LTSP_configuration_in_LDAP.html @@ -130,7 +130,11 @@ personal home page over at redhat.com.

  • August (6)
    • +<<<<<<< Idea_for_storing_LTSP_configuration_in_LDAP.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.126 @@ -244,7 +248,11 @@ personal home page over at redhat.com.

  • multimedia (13)
    • +<<<<<<< Idea_for_storing_LTSP_configuration_in_LDAP.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.126
  • nuug (119)
    • @@ -274,8 +282,13 @@ personal home page over at redhat.com.

  • surveillance (9)
    • +<<<<<<< Idea_for_storing_LTSP_configuration_in_LDAP.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.126
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Initial_notes_on_adding_Open311_server_API_on_FixMyStreet.html b/blog/Initial_notes_on_adding_Open311_server_API_on_FixMyStreet.html index 7d8bb3a1c9..c8abb477b6 100644 --- a/blog/Initial_notes_on_adding_Open311_server_API_on_FixMyStreet.html +++ b/blog/Initial_notes_on_adding_Open311_server_API_on_FixMyStreet.html @@ -129,7 +129,11 @@ work like the free software project communities I am used to.

  • August (6)
    • +<<<<<<< Initial_notes_on_adding_Open311_server_API_on_FixMyStreet.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.23 @@ -243,7 +247,11 @@ work like the free software project communities I am used to.

  • multimedia (13)
    • +<<<<<<< Initial_notes_on_adding_Open311_server_API_on_FixMyStreet.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.23
  • nuug (119)
    • @@ -273,8 +281,13 @@ work like the free software project communities I am used to.

  • surveillance (9)
    • +<<<<<<< Initial_notes_on_adding_Open311_server_API_on_FixMyStreet.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.23
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Inspirerende_fra_en_ukjent_Skolelinux_skole.html b/blog/Inspirerende_fra_en_ukjent_Skolelinux_skole.html index 46bd84e5a8..14d98aee1d 100644 --- a/blog/Inspirerende_fra_en_ukjent_Skolelinux_skole.html +++ b/blog/Inspirerende_fra_en_ukjent_Skolelinux_skole.html @@ -305,7 +305,11 @@ skoleverdagen etter Ã¥ ha jobbet med det i 10 Ã¥r.

  • August (6)
    • +<<<<<<< Inspirerende_fra_en_ukjent_Skolelinux_skole.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.58 @@ -419,7 +423,11 @@ skoleverdagen etter Ã¥ ha jobbet med det i 10 Ã¥r.

  • multimedia (13)
    • +<<<<<<< Inspirerende_fra_en_ukjent_Skolelinux_skole.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.58
  • nuug (119)
    • @@ -449,8 +457,13 @@ skoleverdagen etter Ã¥ ha jobbet med det i 10 Ã¥r.

  • surveillance (9)
    • +<<<<<<< Inspirerende_fra_en_ukjent_Skolelinux_skole.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.58
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Intellektuelt_privilegium___et_bedre_IP_begrep.html b/blog/Intellektuelt_privilegium___et_bedre_IP_begrep.html index ad86f9684f..9ff48e0ca6 100644 --- a/blog/Intellektuelt_privilegium___et_bedre_IP_begrep.html +++ b/blog/Intellektuelt_privilegium___et_bedre_IP_begrep.html @@ -76,7 +76,11 @@ forretningshemmeligheter framover.

  • August (6)
    • +<<<<<<< Intellektuelt_privilegium___et_bedre_IP_begrep.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.234 @@ -190,7 +194,11 @@ forretningshemmeligheter framover.

  • multimedia (13)
    • +<<<<<<< Intellektuelt_privilegium___et_bedre_IP_begrep.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.234
  • nuug (119)
    • @@ -220,8 +228,13 @@ forretningshemmeligheter framover.

  • surveillance (9)
    • +<<<<<<< Intellektuelt_privilegium___et_bedre_IP_begrep.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.234
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Internet_leverand_rer_er_ikke_vokterne_av_sine_kunders_nettbruk.html b/blog/Internet_leverand_rer_er_ikke_vokterne_av_sine_kunders_nettbruk.html index 728f0546e5..9888de8ba3 100644 --- a/blog/Internet_leverand_rer_er_ikke_vokterne_av_sine_kunders_nettbruk.html +++ b/blog/Internet_leverand_rer_er_ikke_vokterne_av_sine_kunders_nettbruk.html @@ -80,7 +80,11 @@ publiseres med mer brukervennlige vilkÃ¥r, som CC-BY og lignende.

  • August (6)
    • +<<<<<<< Internet_leverand_rer_er_ikke_vokterne_av_sine_kunders_nettbruk.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.2 @@ -194,7 +198,11 @@ publiseres med mer brukervennlige vilkÃ¥r, som CC-BY og lignende.

  • multimedia (13)
    • +<<<<<<< Internet_leverand_rer_er_ikke_vokterne_av_sine_kunders_nettbruk.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.2
  • nuug (119)
    • @@ -224,8 +232,13 @@ publiseres med mer brukervennlige vilkÃ¥r, som CC-BY og lignende.

  • surveillance (9)
    • +<<<<<<< Internet_leverand_rer_er_ikke_vokterne_av_sine_kunders_nettbruk.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.2
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Internet_sensur_skal_i_retten_p__mandag.html b/blog/Internet_sensur_skal_i_retten_p__mandag.html index b48aa916ac..41d88ea827 100644 --- a/blog/Internet_sensur_skal_i_retten_p__mandag.html +++ b/blog/Internet_sensur_skal_i_retten_p__mandag.html @@ -81,7 +81,11 @@ bruk av musikk.

  • August (6)
    • +<<<<<<< Internet_sensur_skal_i_retten_p__mandag.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.2 @@ -195,7 +199,11 @@ bruk av musikk.

  • multimedia (13)
    • +<<<<<<< Internet_sensur_skal_i_retten_p__mandag.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.2
  • nuug (119)
    • @@ -225,8 +233,13 @@ bruk av musikk.

  • surveillance (9)
    • +<<<<<<< Internet_sensur_skal_i_retten_p__mandag.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.2
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Is_Ogg_Theora_a_free_and_open_standard_.html b/blog/Is_Ogg_Theora_a_free_and_open_standard_.html index a4fcd30074..06a3db5a93 100644 --- a/blog/Is_Ogg_Theora_a_free_and_open_standard_.html +++ b/blog/Is_Ogg_Theora_a_free_and_open_standard_.html @@ -209,7 +209,11 @@ see if they are free and open standards.

  • August (6)
    • +<<<<<<< Is_Ogg_Theora_a_free_and_open_standard_.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.62 @@ -323,7 +327,11 @@ see if they are free and open standards.

  • multimedia (13)
    • +<<<<<<< Is_Ogg_Theora_a_free_and_open_standard_.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.62
  • nuug (119)
    • @@ -353,8 +361,13 @@ see if they are free and open standards.

  • surveillance (9)
    • +<<<<<<< Is_Ogg_Theora_a_free_and_open_standard_.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.62
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Jeg_vil_beholde_tusenlappen___jeg_bruker_den.html b/blog/Jeg_vil_beholde_tusenlappen___jeg_bruker_den.html index 8d189ab24d..c32402515e 100644 --- a/blog/Jeg_vil_beholde_tusenlappen___jeg_bruker_den.html +++ b/blog/Jeg_vil_beholde_tusenlappen___jeg_bruker_den.html @@ -105,7 +105,11 @@ kontanter for noen dager siden.

  • August (6)
    • +<<<<<<< Jeg_vil_beholde_tusenlappen___jeg_bruker_den.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.241 @@ -219,7 +223,11 @@ kontanter for noen dager siden.

  • multimedia (13)
    • +<<<<<<< Jeg_vil_beholde_tusenlappen___jeg_bruker_den.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.241
  • nuug (119)
    • @@ -249,8 +257,13 @@ kontanter for noen dager siden.

  • surveillance (9)
    • +<<<<<<< Jeg_vil_beholde_tusenlappen___jeg_bruker_den.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.241
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Jeg_vil_ikke_ha_BankID.html b/blog/Jeg_vil_ikke_ha_BankID.html index 89e02205ca..6bced132cb 100644 --- a/blog/Jeg_vil_ikke_ha_BankID.html +++ b/blog/Jeg_vil_ikke_ha_BankID.html @@ -139,7 +139,11 @@ nettbankkontroll over egne midler. :(
  • August (6)
    • +<<<<<<< Jeg_vil_ikke_ha_BankID.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.181 @@ -253,7 +257,11 @@ nettbankkontroll over egne midler. :(
  • multimedia (13)
    • +<<<<<<< Jeg_vil_ikke_ha_BankID.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.181
  • nuug (119)
    • @@ -283,8 +291,13 @@ nettbankkontroll over egne midler. :(
  • surveillance (9)
    • +<<<<<<< Jeg_vil_ikke_ha_BankID.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.181
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/KDM_fail_at_boot_with_NVidia_cards___and_no_one_try_to_fix_it_.html b/blog/KDM_fail_at_boot_with_NVidia_cards___and_no_one_try_to_fix_it_.html index f69f2b8125..41f3f73f05 100644 --- a/blog/KDM_fail_at_boot_with_NVidia_cards___and_no_one_try_to_fix_it_.html +++ b/blog/KDM_fail_at_boot_with_NVidia_cards___and_no_one_try_to_fix_it_.html @@ -79,7 +79,11 @@ but I am pretty sure that waiting for each other is not it.

  • August (6)
    • +<<<<<<< KDM_fail_at_boot_with_NVidia_cards___and_no_one_try_to_fix_it_.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.151 @@ -193,7 +197,11 @@ but I am pretty sure that waiting for each other is not it.

  • multimedia (13)
    • +<<<<<<< KDM_fail_at_boot_with_NVidia_cards___and_no_one_try_to_fix_it_.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.151
  • nuug (119)
    • @@ -223,8 +231,13 @@ but I am pretty sure that waiting for each other is not it.

  • surveillance (9)
    • +<<<<<<< KDM_fail_at_boot_with_NVidia_cards___and_no_one_try_to_fix_it_.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.151
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Kart_over_overv_kningskamera_i_Norge.html b/blog/Kart_over_overv_kningskamera_i_Norge.html index 3e102c1b2a..e9917175d2 100644 --- a/blog/Kart_over_overv_kningskamera_i_Norge.html +++ b/blog/Kart_over_overv_kningskamera_i_Norge.html @@ -74,7 +74,11 @@ automatisk over i spesialkartet.

  • August (6)
    • +<<<<<<< Kart_over_overv_kningskamera_i_Norge.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.2 @@ -188,7 +192,11 @@ automatisk over i spesialkartet.

  • multimedia (13)
    • +<<<<<<< Kart_over_overv_kningskamera_i_Norge.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.2
  • nuug (119)
    • @@ -218,8 +226,13 @@ automatisk over i spesialkartet.

  • surveillance (9)
    • +<<<<<<< Kart_over_overv_kningskamera_i_Norge.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.2
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Kartverket__frigj_r__data_men_er_fortsatt_ikke_interessante.html b/blog/Kartverket__frigj_r__data_men_er_fortsatt_ikke_interessante.html index c21ab0ec90..72969aa802 100644 --- a/blog/Kartverket__frigj_r__data_men_er_fortsatt_ikke_interessante.html +++ b/blog/Kartverket__frigj_r__data_men_er_fortsatt_ikke_interessante.html @@ -91,7 +91,11 @@ nye i stedet.

  • August (6)
    • +<<<<<<< Kartverket__frigj_r__data_men_er_fortsatt_ikke_interessante.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.2 @@ -205,7 +209,11 @@ nye i stedet.

  • multimedia (13)
    • +<<<<<<< Kartverket__frigj_r__data_men_er_fortsatt_ikke_interessante.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.2
  • nuug (119)
    • @@ -235,8 +243,13 @@ nye i stedet.

  • surveillance (9)
    • +<<<<<<< Kartverket__frigj_r__data_men_er_fortsatt_ikke_interessante.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.2
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Kartverkets_lansering_av_tjenesten_Se_Eiendom_har_potensiale__hvis_bruksvilk_rene_ikke_blokkerer.html b/blog/Kartverkets_lansering_av_tjenesten_Se_Eiendom_har_potensiale__hvis_bruksvilk_rene_ikke_blokkerer.html index a796ecf6f0..81388f7cc3 100644 --- a/blog/Kartverkets_lansering_av_tjenesten_Se_Eiendom_har_potensiale__hvis_bruksvilk_rene_ikke_blokkerer.html +++ b/blog/Kartverkets_lansering_av_tjenesten_Se_Eiendom_har_potensiale__hvis_bruksvilk_rene_ikke_blokkerer.html @@ -143,7 +143,11 @@ Finnmarksvidda) ikke fungerer. Vet ikke hva det kommer av.

  • August (6)
    • +<<<<<<< Kartverkets_lansering_av_tjenesten_Se_Eiendom_har_potensiale__hvis_bruksvilk_rene_ikke_blokkerer.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.2 @@ -257,7 +261,11 @@ Finnmarksvidda) ikke fungerer. Vet ikke hva det kommer av.

  • multimedia (13)
    • +<<<<<<< Kartverkets_lansering_av_tjenesten_Se_Eiendom_har_potensiale__hvis_bruksvilk_rene_ikke_blokkerer.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.2
  • nuug (119)
    • @@ -287,8 +295,13 @@ Finnmarksvidda) ikke fungerer. Vet ikke hva det kommer av.

  • surveillance (9)
    • +<<<<<<< Kartverkets_lansering_av_tjenesten_Se_Eiendom_har_potensiale__hvis_bruksvilk_rene_ikke_blokkerer.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.2
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Kategorisering_av_problemer_p__FiksGatami.html b/blog/Kategorisering_av_problemer_p__FiksGatami.html index ffd1524113..f1646139a7 100644 --- a/blog/Kategorisering_av_problemer_p__FiksGatami.html +++ b/blog/Kategorisering_av_problemer_p__FiksGatami.html @@ -120,7 +120,11 @@ med i laget nÃ¥r det gjelder kategorisering.

  • August (6)
    • +<<<<<<< Kategorisering_av_problemer_p__FiksGatami.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.2 @@ -234,7 +238,11 @@ med i laget nÃ¥r det gjelder kategorisering.

  • multimedia (13)
    • +<<<<<<< Kategorisering_av_problemer_p__FiksGatami.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.2
  • nuug (119)
    • @@ -264,8 +272,13 @@ med i laget nÃ¥r det gjelder kategorisering.

  • surveillance (9)
    • +<<<<<<< Kategorisering_av_problemer_p__FiksGatami.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.2
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Kerberos_for_Debian_Edu_Squeeze_.html b/blog/Kerberos_for_Debian_Edu_Squeeze_.html index f9d62dad2d..1f14ea93cb 100644 --- a/blog/Kerberos_for_Debian_Edu_Squeeze_.html +++ b/blog/Kerberos_for_Debian_Edu_Squeeze_.html @@ -92,7 +92,11 @@ up in a few days.

  • August (6)
    • +<<<<<<< Kerberos_for_Debian_Edu_Squeeze_.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.165 @@ -206,7 +210,11 @@ up in a few days.

  • multimedia (13)
    • +<<<<<<< Kerberos_for_Debian_Edu_Squeeze_.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.165
  • nuug (119)
    • @@ -236,8 +244,13 @@ up in a few days.

  • surveillance (9)
    • +<<<<<<< Kerberos_for_Debian_Edu_Squeeze_.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.165
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Kommunevalget_m__visst_kontrollregnes_p_.html b/blog/Kommunevalget_m__visst_kontrollregnes_p_.html new file mode 100644 index 0000000000..0e4e31bfb0 --- /dev/null +++ b/blog/Kommunevalget_m__visst_kontrollregnes_p_.html @@ -0,0 +1,227 @@ + + + + + Petter Reinholdtsen: Kommunevalget mÃ¥ visst kontrollregnes pÃ¥ + + + + +
    +

    + Petter Reinholdtsen + +

    + +
    + + +
    +
    Kommunevalget må visst kontrollregnes på
    +
    14th September 2011
    +

    En artikkel i aftenbladet påstår at valgsystemet til EDB Ergogroup +ikke +regner riktig mandatfordeling i Stavanger. Det høres for meg ut +som om innbyggerne i Norge er nødt til å kontrollregne på +mandatfordelingen for å sikre at valget går riktig for seg. Det tar +jeg som nok et argument for nøyere kontroll av det norske +valgsystemet.

    +
    + +
    Tags: norsk, valg.
    + + +
    + + + + + +

    + Created by Chronicle v4.4 +

    + + + diff --git a/blog/Konsekvenser_av_un_yaktige_kommunesgrenser_for_FiksGataMi.html b/blog/Konsekvenser_av_un_yaktige_kommunesgrenser_for_FiksGataMi.html index ef3465c298..985307d212 100644 --- a/blog/Konsekvenser_av_un_yaktige_kommunesgrenser_for_FiksGataMi.html +++ b/blog/Konsekvenser_av_un_yaktige_kommunesgrenser_for_FiksGataMi.html @@ -89,7 +89,11 @@ fortsettelsen.

  • August (6)
    • +<<<<<<< Konsekvenser_av_un_yaktige_kommunesgrenser_for_FiksGataMi.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.2 @@ -203,7 +207,11 @@ fortsettelsen.

  • multimedia (13)
    • +<<<<<<< Konsekvenser_av_un_yaktige_kommunesgrenser_for_FiksGataMi.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.2
  • nuug (119)
    • @@ -233,8 +241,13 @@ fortsettelsen.

  • surveillance (9)
    • +<<<<<<< Konsekvenser_av_un_yaktige_kommunesgrenser_for_FiksGataMi.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.2
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Korrupsjon_p__h_yeste_niv__.html b/blog/Korrupsjon_p__h_yeste_niv__.html index 8d02bf8850..537039575c 100644 --- a/blog/Korrupsjon_p__h_yeste_niv__.html +++ b/blog/Korrupsjon_p__h_yeste_niv__.html @@ -72,7 +72,11 @@ Sverige blir søndagskolefortellinger i sammenligning.

  • August (6)
    • +<<<<<<< Korrupsjon_p__h_yeste_niv__.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.2 @@ -186,7 +190,11 @@ Sverige blir søndagskolefortellinger i sammenligning.

  • multimedia (13)
    • +<<<<<<< Korrupsjon_p__h_yeste_niv__.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.2
  • nuug (119)
    • @@ -216,8 +224,13 @@ Sverige blir søndagskolefortellinger i sammenligning.

  • surveillance (9)
    • +<<<<<<< Korrupsjon_p__h_yeste_niv__.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.2
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Kort_innspill_til_norsk_lisens_for_offentlige_data.html b/blog/Kort_innspill_til_norsk_lisens_for_offentlige_data.html index 5e4a8884ac..0276351173 100644 --- a/blog/Kort_innspill_til_norsk_lisens_for_offentlige_data.html +++ b/blog/Kort_innspill_til_norsk_lisens_for_offentlige_data.html @@ -104,7 +104,11 @@ gjenbruk av offentlige data.

  • August (6)
    • +<<<<<<< Kort_innspill_til_norsk_lisens_for_offentlige_data.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.30 @@ -218,7 +222,11 @@ gjenbruk av offentlige data.

  • multimedia (13)
    • +<<<<<<< Kort_innspill_til_norsk_lisens_for_offentlige_data.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.30
  • nuug (119)
    • @@ -248,8 +256,13 @@ gjenbruk av offentlige data.

  • surveillance (9)
    • +<<<<<<< Kort_innspill_til_norsk_lisens_for_offentlige_data.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.30
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Kryptert_harddisk___naturligvis.html b/blog/Kryptert_harddisk___naturligvis.html index 39548765fc..792051f77e 100644 --- a/blog/Kryptert_harddisk___naturligvis.html +++ b/blog/Kryptert_harddisk___naturligvis.html @@ -85,7 +85,11 @@ betydelige.

  • August (6)
    • +<<<<<<< Kryptert_harddisk___naturligvis.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.202 @@ -199,7 +203,11 @@ betydelige.

  • multimedia (13)
    • +<<<<<<< Kryptert_harddisk___naturligvis.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.202
  • nuug (119)
    • @@ -229,8 +237,13 @@ betydelige.

  • surveillance (9)
    • +<<<<<<< Kryptert_harddisk___naturligvis.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.202
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/LUMA__a_very_nice_LDAP_GUI.html b/blog/LUMA__a_very_nice_LDAP_GUI.html index 12c8f8d12c..54001fa48a 100644 --- a/blog/LUMA__a_very_nice_LDAP_GUI.html +++ b/blog/LUMA__a_very_nice_LDAP_GUI.html @@ -86,7 +86,11 @@ changes, it will not be an option for Debian Edu based on Squeeze.

  • August (6)
    • +<<<<<<< LUMA__a_very_nice_LDAP_GUI.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.133 @@ -200,7 +204,11 @@ changes, it will not be an option for Debian Edu based on Squeeze.

  • multimedia (13)
    • +<<<<<<< LUMA__a_very_nice_LDAP_GUI.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.133
  • nuug (119)
    • @@ -230,8 +238,13 @@ changes, it will not be an option for Debian Edu based on Squeeze.

  • surveillance (9)
    • +<<<<<<< LUMA__a_very_nice_LDAP_GUI.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.133
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Lenker_samlet_2009_05_09.html b/blog/Lenker_samlet_2009_05_09.html index c7ef6edd3b..fb0d11adfb 100644 --- a/blog/Lenker_samlet_2009_05_09.html +++ b/blog/Lenker_samlet_2009_05_09.html @@ -74,7 +74,11 @@ Word 2007 hÃ¥ndterer ODF dÃ¥rlig
  • August (6)
    • +<<<<<<< Lenker_samlet_2009_05_09.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.199 @@ -188,7 +192,11 @@ Word 2007 hÃ¥ndterer ODF dÃ¥rlig
  • multimedia (13)
    • +<<<<<<< Lenker_samlet_2009_05_09.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.199
  • nuug (119)
    • @@ -218,8 +226,13 @@ Word 2007 hÃ¥ndterer ODF dÃ¥rlig
  • surveillance (9)
    • +<<<<<<< Lenker_samlet_2009_05_09.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.199
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Lenny__Squeeze_upgrades__apt_vs_aptitude_with_the_Gnome_and_KDE_desktop.html b/blog/Lenny__Squeeze_upgrades__apt_vs_aptitude_with_the_Gnome_and_KDE_desktop.html index 5c8401fbf5..ea02168234 100644 --- a/blog/Lenny__Squeeze_upgrades__apt_vs_aptitude_with_the_Gnome_and_KDE_desktop.html +++ b/blog/Lenny__Squeeze_upgrades__apt_vs_aptitude_with_the_Gnome_and_KDE_desktop.html @@ -269,7 +269,11 @@ Installed using apt-get, removed with aptitude
  • August (6)
    • +<<<<<<< Lenny__Squeeze_upgrades__apt_vs_aptitude_with_the_Gnome_and_KDE_desktop.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.77 @@ -383,7 +387,11 @@ Installed using apt-get, removed with aptitude
  • multimedia (13)
    • +<<<<<<< Lenny__Squeeze_upgrades__apt_vs_aptitude_with_the_Gnome_and_KDE_desktop.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.77
  • nuug (119)
    • @@ -413,8 +421,13 @@ Installed using apt-get, removed with aptitude
  • surveillance (9)
    • +<<<<<<< Lenny__Squeeze_upgrades__apt_vs_aptitude_with_the_Gnome_and_KDE_desktop.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.77
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Lenny__Squeeze_upgrades__apt_vs_aptitude_with_the_Gnome_desktop.html b/blog/Lenny__Squeeze_upgrades__apt_vs_aptitude_with_the_Gnome_desktop.html index 55d7fa1763..265ae043cc 100644 --- a/blog/Lenny__Squeeze_upgrades__apt_vs_aptitude_with_the_Gnome_desktop.html +++ b/blog/Lenny__Squeeze_upgrades__apt_vs_aptitude_with_the_Gnome_desktop.html @@ -148,7 +148,11 @@ the difference somewhat.
  • August (6)
    • +<<<<<<< Lenny__Squeeze_upgrades__apt_vs_aptitude_with_the_Gnome_desktop.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.129 @@ -262,7 +266,11 @@ the difference somewhat.
  • multimedia (13)
    • +<<<<<<< Lenny__Squeeze_upgrades__apt_vs_aptitude_with_the_Gnome_desktop.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.129
  • nuug (119)
    • @@ -292,8 +300,13 @@ the difference somewhat.
  • surveillance (9)
    • +<<<<<<< Lenny__Squeeze_upgrades__apt_vs_aptitude_with_the_Gnome_desktop.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.129
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Lenny__Squeeze_upgrades__removals_by_apt_and_aptitude.html b/blog/Lenny__Squeeze_upgrades__removals_by_apt_and_aptitude.html index 801ac11c91..bc4d3770ee 100644 --- a/blog/Lenny__Squeeze_upgrades__removals_by_apt_and_aptitude.html +++ b/blog/Lenny__Squeeze_upgrades__removals_by_apt_and_aptitude.html @@ -224,7 +224,11 @@ continue.

  • August (6)
    • +<<<<<<< Lenny__Squeeze_upgrades__removals_by_apt_and_aptitude.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.140 @@ -338,7 +342,11 @@ continue.

  • multimedia (13)
    • +<<<<<<< Lenny__Squeeze_upgrades__removals_by_apt_and_aptitude.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.140
  • nuug (119)
    • @@ -368,8 +376,13 @@ continue.

  • surveillance (9)
    • +<<<<<<< Lenny__Squeeze_upgrades__removals_by_apt_and_aptitude.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.140
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Lenny__Squeeze_upgrades_of_the_Gnome_and_KDE_desktop__now_with_apt_get_autoremove.html b/blog/Lenny__Squeeze_upgrades_of_the_Gnome_and_KDE_desktop__now_with_apt_get_autoremove.html index 3317cc39b0..8c1e065f25 100644 --- a/blog/Lenny__Squeeze_upgrades_of_the_Gnome_and_KDE_desktop__now_with_apt_get_autoremove.html +++ b/blog/Lenny__Squeeze_upgrades_of_the_Gnome_and_KDE_desktop__now_with_apt_get_autoremove.html @@ -493,7 +493,11 @@ the upgrade, but hope those that do can have a look.

  • August (6)
    • +<<<<<<< Lenny__Squeeze_upgrades_of_the_Gnome_and_KDE_desktop__now_with_apt_get_autoremove.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.75 @@ -607,7 +611,11 @@ the upgrade, but hope those that do can have a look.

  • multimedia (13)
    • +<<<<<<< Lenny__Squeeze_upgrades_of_the_Gnome_and_KDE_desktop__now_with_apt_get_autoremove.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.75
  • nuug (119)
    • @@ -637,8 +645,13 @@ the upgrade, but hope those that do can have a look.

  • surveillance (9)
    • +<<<<<<< Lenny__Squeeze_upgrades_of_the_Gnome_and_KDE_desktop__now_with_apt_get_autoremove.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.75
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Links_for_2010_10_03.html b/blog/Links_for_2010_10_03.html index 4d01dc9c6e..9b0d2c56d2 100644 --- a/blog/Links_for_2010_10_03.html +++ b/blog/Links_for_2010_10_03.html @@ -71,7 +71,11 @@ simple setup.
  • August (6)
    • +<<<<<<< Links_for_2010_10_03.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.95 @@ -185,7 +189,11 @@ simple setup.
  • multimedia (13)
    • +<<<<<<< Links_for_2010_10_03.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.95
  • nuug (119)
    • @@ -215,8 +223,13 @@ simple setup.
  • surveillance (9)
    • +<<<<<<< Links_for_2010_10_03.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.95
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Links_for_2010_10_14.html b/blog/Links_for_2010_10_14.html index a55c57bf43..42d93a8233 100644 --- a/blog/Links_for_2010_10_14.html +++ b/blog/Links_for_2010_10_14.html @@ -90,7 +90,11 @@ forslag for et rent og sikkert Internet.
  • August (6)
    • +<<<<<<< Links_for_2010_10_14.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.93 @@ -204,7 +208,11 @@ forslag for et rent og sikkert Internet.
  • multimedia (13)
    • +<<<<<<< Links_for_2010_10_14.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.93
  • nuug (119)
    • @@ -234,8 +242,13 @@ forslag for et rent og sikkert Internet.
  • surveillance (9)
    • +<<<<<<< Links_for_2010_10_14.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.93
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Lisensvalg_for_NUUG_opptakene_endelig_p__plass.html b/blog/Lisensvalg_for_NUUG_opptakene_endelig_p__plass.html index 1931c815d4..044d625b18 100644 --- a/blog/Lisensvalg_for_NUUG_opptakene_endelig_p__plass.html +++ b/blog/Lisensvalg_for_NUUG_opptakene_endelig_p__plass.html @@ -65,7 +65,11 @@ i denne sammenhengen.

  • August (6)
    • +<<<<<<< Lisensvalg_for_NUUG_opptakene_endelig_p__plass.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.2 @@ -179,7 +183,11 @@ i denne sammenhengen.

  • multimedia (13)
    • +<<<<<<< Lisensvalg_for_NUUG_opptakene_endelig_p__plass.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.2
  • nuug (119)
    • @@ -209,8 +217,13 @@ i denne sammenhengen.

  • surveillance (9)
    • +<<<<<<< Lisensvalg_for_NUUG_opptakene_endelig_p__plass.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.2
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Litt_om_valgfusk_og_problemet_med_elektronisk_stemmegiving.html b/blog/Litt_om_valgfusk_og_problemet_med_elektronisk_stemmegiving.html index 192b5d0f31..99cc7029ee 100644 --- a/blog/Litt_om_valgfusk_og_problemet_med_elektronisk_stemmegiving.html +++ b/blog/Litt_om_valgfusk_og_problemet_med_elektronisk_stemmegiving.html @@ -85,7 +85,11 @@ inneholdt i Iran hvis de ikke hadde hemmelige valg?

  • August (6)
    • +<<<<<<< Litt_om_valgfusk_og_problemet_med_elektronisk_stemmegiving.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.194 @@ -199,7 +203,11 @@ inneholdt i Iran hvis de ikke hadde hemmelige valg?

  • multimedia (13)
    • +<<<<<<< Litt_om_valgfusk_og_problemet_med_elektronisk_stemmegiving.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.194
  • nuug (119)
    • @@ -229,8 +237,13 @@ inneholdt i Iran hvis de ikke hadde hemmelige valg?

  • surveillance (9)
    • +<<<<<<< Litt_om_valgfusk_og_problemet_med_elektronisk_stemmegiving.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.194
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/MS_Word_kr_ller_det_til_for_politiet_.html b/blog/MS_Word_kr_ller_det_til_for_politiet_.html index 8718ca3b07..636ca3ffd4 100644 --- a/blog/MS_Word_kr_ller_det_til_for_politiet_.html +++ b/blog/MS_Word_kr_ller_det_til_for_politiet_.html @@ -76,7 +76,11 @@ offentlig myndighet?

  • August (6)
    • +<<<<<<< MS_Word_kr_ller_det_til_for_politiet_.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.2 @@ -190,7 +194,11 @@ offentlig myndighet?

  • multimedia (13)
    • +<<<<<<< MS_Word_kr_ller_det_til_for_politiet_.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.2
  • nuug (119)
    • @@ -220,8 +228,13 @@ offentlig myndighet?

  • surveillance (9)
    • +<<<<<<< MS_Word_kr_ller_det_til_for_politiet_.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.2
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/MVA_p__b_ker_med_DRM__ikke_MVA_p__b_ker_uten_DRM_.html b/blog/MVA_p__b_ker_med_DRM__ikke_MVA_p__b_ker_uten_DRM_.html index 9f06d24415..ba707f5fa2 100644 --- a/blog/MVA_p__b_ker_med_DRM__ikke_MVA_p__b_ker_uten_DRM_.html +++ b/blog/MVA_p__b_ker_med_DRM__ikke_MVA_p__b_ker_uten_DRM_.html @@ -74,7 +74,11 @@ DRM mÃ¥ anses som et kjøp.

  • August (6)
    • +<<<<<<< MVA_p__b_ker_med_DRM__ikke_MVA_p__b_ker_uten_DRM_.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.4 @@ -188,7 +192,11 @@ DRM mÃ¥ anses som et kjøp.

  • multimedia (13)
    • +<<<<<<< MVA_p__b_ker_med_DRM__ikke_MVA_p__b_ker_uten_DRM_.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.4
  • nuug (119)
    • @@ -218,8 +226,13 @@ DRM mÃ¥ anses som et kjøp.

  • surveillance (9)
    • +<<<<<<< MVA_p__b_ker_med_DRM__ikke_MVA_p__b_ker_uten_DRM_.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.4
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Magnetstripeinnhold_i_billetter_fra_Flytoget_og_Hurtigruten.html b/blog/Magnetstripeinnhold_i_billetter_fra_Flytoget_og_Hurtigruten.html index cb5d186845..47bd65f302 100644 --- a/blog/Magnetstripeinnhold_i_billetter_fra_Flytoget_og_Hurtigruten.html +++ b/blog/Magnetstripeinnhold_i_billetter_fra_Flytoget_og_Hurtigruten.html @@ -110,7 +110,11 @@ ser jeg mye korrespondanse mellom pÃ¥trykk og magnetstripe.

  • August (6)
    • +<<<<<<< Magnetstripeinnhold_i_billetter_fra_Flytoget_og_Hurtigruten.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.154 @@ -224,7 +228,11 @@ ser jeg mye korrespondanse mellom pÃ¥trykk og magnetstripe.

  • multimedia (13)
    • +<<<<<<< Magnetstripeinnhold_i_billetter_fra_Flytoget_og_Hurtigruten.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.154
  • nuug (119)
    • @@ -254,8 +262,13 @@ ser jeg mye korrespondanse mellom pÃ¥trykk og magnetstripe.

  • surveillance (9)
    • +<<<<<<< Magnetstripeinnhold_i_billetter_fra_Flytoget_og_Hurtigruten.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.154
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Making_room_on_the_Debian_Edu_Sqeeze_DVD.html b/blog/Making_room_on_the_Debian_Edu_Sqeeze_DVD.html index 4452359980..136b1f108e 100644 --- a/blog/Making_room_on_the_Debian_Edu_Sqeeze_DVD.html +++ b/blog/Making_room_on_the_Debian_Edu_Sqeeze_DVD.html @@ -92,7 +92,11 @@ DVD more useful again.

  • August (6)
    • +<<<<<<< Making_room_on_the_Debian_Edu_Sqeeze_DVD.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.85 @@ -206,7 +210,11 @@ DVD more useful again.

  • multimedia (13)
    • +<<<<<<< Making_room_on_the_Debian_Edu_Sqeeze_DVD.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.85
  • nuug (119)
    • @@ -236,8 +244,13 @@ DVD more useful again.

  • surveillance (9)
    • +<<<<<<< Making_room_on_the_Debian_Edu_Sqeeze_DVD.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.85
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Martin_Bekkelund__En_stille_b_nn_om_Datalagringsdirektivet.html b/blog/Martin_Bekkelund__En_stille_b_nn_om_Datalagringsdirektivet.html index 68f697c0a8..8a9da48efe 100644 --- a/blog/Martin_Bekkelund__En_stille_b_nn_om_Datalagringsdirektivet.html +++ b/blog/Martin_Bekkelund__En_stille_b_nn_om_Datalagringsdirektivet.html @@ -112,7 +112,11 @@ fÃ¥r snart se om det stemmer.

  • August (6)
    • +<<<<<<< Martin_Bekkelund__En_stille_b_nn_om_Datalagringsdirektivet.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.2 @@ -226,7 +230,11 @@ fÃ¥r snart se om det stemmer.

  • multimedia (13)
    • +<<<<<<< Martin_Bekkelund__En_stille_b_nn_om_Datalagringsdirektivet.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.2
  • nuug (119)
    • @@ -256,8 +264,13 @@ fÃ¥r snart se om det stemmer.

  • surveillance (9)
    • +<<<<<<< Martin_Bekkelund__En_stille_b_nn_om_Datalagringsdirektivet.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.2
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Massiv_overv_kning_av_kollektivtrafikken_i_Oslo_planlegges.html b/blog/Massiv_overv_kning_av_kollektivtrafikken_i_Oslo_planlegges.html index 5a6caee010..b5074779f5 100644 --- a/blog/Massiv_overv_kning_av_kollektivtrafikken_i_Oslo_planlegges.html +++ b/blog/Massiv_overv_kning_av_kollektivtrafikken_i_Oslo_planlegges.html @@ -68,7 +68,11 @@ OsloomrÃ¥det.

  • August (6)
    • +<<<<<<< Massiv_overv_kning_av_kollektivtrafikken_i_Oslo_planlegges.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.2 @@ -182,7 +186,11 @@ OsloomrÃ¥det.

  • multimedia (13)
    • +<<<<<<< Massiv_overv_kning_av_kollektivtrafikken_i_Oslo_planlegges.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.2
  • nuug (119)
    • @@ -212,8 +220,13 @@ OsloomrÃ¥det.

  • surveillance (9)
    • +<<<<<<< Massiv_overv_kning_av_kollektivtrafikken_i_Oslo_planlegges.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.2
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Masteroppgave_fra_UiO_om_RFID_sikkerhet.html b/blog/Masteroppgave_fra_UiO_om_RFID_sikkerhet.html index 39b047dfdb..9f3ea57320 100644 --- a/blog/Masteroppgave_fra_UiO_om_RFID_sikkerhet.html +++ b/blog/Masteroppgave_fra_UiO_om_RFID_sikkerhet.html @@ -86,7 +86,11 @@ i 2007. Det er i dag mulig Ã¥ klone slike kort.

  • August (6)
    • +<<<<<<< Masteroppgave_fra_UiO_om_RFID_sikkerhet.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.44 @@ -200,7 +204,11 @@ i 2007. Det er i dag mulig Ã¥ klone slike kort.

  • multimedia (13)
    • +<<<<<<< Masteroppgave_fra_UiO_om_RFID_sikkerhet.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.44
  • nuug (119)
    • @@ -230,8 +238,13 @@ i 2007. Det er i dag mulig Ã¥ klone slike kort.

  • surveillance (9)
    • +<<<<<<< Masteroppgave_fra_UiO_om_RFID_sikkerhet.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.44
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Mekanikk_delen_av_reprap_byggesettet_i_hus.html b/blog/Mekanikk_delen_av_reprap_byggesettet_i_hus.html index 622690b44c..0eb86b18b1 100644 --- a/blog/Mekanikk_delen_av_reprap_byggesettet_i_hus.html +++ b/blog/Mekanikk_delen_av_reprap_byggesettet_i_hus.html @@ -73,7 +73,11 @@ og kan melde seg pÃ¥ aktive@nuug.no.

  • August (6)
    • +<<<<<<< Mekanikk_delen_av_reprap_byggesettet_i_hus.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.247 @@ -187,7 +191,11 @@ og kan melde seg pÃ¥ aktive@nuug.no.

  • multimedia (13)
    • +<<<<<<< Mekanikk_delen_av_reprap_byggesettet_i_hus.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.247
  • nuug (119)
    • @@ -217,8 +225,13 @@ og kan melde seg pÃ¥ aktive@nuug.no.

  • surveillance (9)
    • +<<<<<<< Mekanikk_delen_av_reprap_byggesettet_i_hus.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.247
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Mekanikk_delen_av_reprap_byggesettet_p__vei.html b/blog/Mekanikk_delen_av_reprap_byggesettet_p__vei.html index ea7dc86fe2..846a33429f 100644 --- a/blog/Mekanikk_delen_av_reprap_byggesettet_p__vei.html +++ b/blog/Mekanikk_delen_av_reprap_byggesettet_p__vei.html @@ -65,7 +65,11 @@ bort første pakke.

  • August (6)
    • +<<<<<<< Mekanikk_delen_av_reprap_byggesettet_p__vei.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.2 @@ -179,7 +183,11 @@ bort første pakke.

  • multimedia (13)
    • +<<<<<<< Mekanikk_delen_av_reprap_byggesettet_p__vei.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.2
  • nuug (119)
    • @@ -209,8 +217,13 @@ bort første pakke.

  • surveillance (9)
    • +<<<<<<< Mekanikk_delen_av_reprap_byggesettet_p__vei.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.2
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Mens_vi_venter_p__3D_skriveren.html b/blog/Mens_vi_venter_p__3D_skriveren.html index 67edd45141..60ca3b709f 100644 --- a/blog/Mens_vi_venter_p__3D_skriveren.html +++ b/blog/Mens_vi_venter_p__3D_skriveren.html @@ -77,7 +77,11 @@ hÃ¥per det ikke gÃ¥r tapt pÃ¥ samme vis.

  • August (6)
    • +<<<<<<< Mens_vi_venter_p__3D_skriveren.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.2 @@ -191,7 +195,11 @@ hÃ¥per det ikke gÃ¥r tapt pÃ¥ samme vis.

  • multimedia (13)
    • +<<<<<<< Mens_vi_venter_p__3D_skriveren.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.2
  • nuug (119)
    • @@ -221,8 +229,13 @@ hÃ¥per det ikke gÃ¥r tapt pÃ¥ samme vis.

  • surveillance (9)
    • +<<<<<<< Mens_vi_venter_p__3D_skriveren.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.2
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Mer_l_gnpropaganda_fra_BSA.html b/blog/Mer_l_gnpropaganda_fra_BSA.html index da05fd7d75..04410f5e99 100644 --- a/blog/Mer_l_gnpropaganda_fra_BSA.html +++ b/blog/Mer_l_gnpropaganda_fra_BSA.html @@ -106,7 +106,11 @@ føre til at flere tar i bruk fri programvare.

  • August (6)
    • +<<<<<<< Mer_l_gnpropaganda_fra_BSA.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.2 @@ -220,7 +224,11 @@ føre til at flere tar i bruk fri programvare.

  • multimedia (13)
    • +<<<<<<< Mer_l_gnpropaganda_fra_BSA.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.2
  • nuug (119)
    • @@ -250,8 +258,13 @@ føre til at flere tar i bruk fri programvare.

  • surveillance (9)
    • +<<<<<<< Mer_l_gnpropaganda_fra_BSA.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.2
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Microsofts_misvisende_argumentasjon_rundt_multimediaformater.html b/blog/Microsofts_misvisende_argumentasjon_rundt_multimediaformater.html index c947214a6c..abfeb8a1eb 100644 --- a/blog/Microsofts_misvisende_argumentasjon_rundt_multimediaformater.html +++ b/blog/Microsofts_misvisende_argumentasjon_rundt_multimediaformater.html @@ -97,7 +97,11 @@ misvisende pÃ¥stander etter i sømmene.

  • August (6)
    • +<<<<<<< Microsofts_misvisende_argumentasjon_rundt_multimediaformater.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.191 @@ -211,7 +215,11 @@ misvisende pÃ¥stander etter i sømmene.

  • multimedia (13)
    • +<<<<<<< Microsofts_misvisende_argumentasjon_rundt_multimediaformater.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.191
  • nuug (119)
    • @@ -241,8 +249,13 @@ misvisende pÃ¥stander etter i sømmene.

  • surveillance (9)
    • +<<<<<<< Microsofts_misvisende_argumentasjon_rundt_multimediaformater.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.191
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Migrating_Xen_virtual_machines_using_LVM_to_KVM_using_disk_images.html b/blog/Migrating_Xen_virtual_machines_using_LVM_to_KVM_using_disk_images.html index 518a82fb34..32b5067b6f 100644 --- a/blog/Migrating_Xen_virtual_machines_using_LVM_to_KVM_using_disk_images.html +++ b/blog/Migrating_Xen_virtual_machines_using_LVM_to_KVM_using_disk_images.html @@ -128,7 +128,11 @@ seem to work just fine.

  • August (6)
    • +<<<<<<< Migrating_Xen_virtual_machines_using_LVM_to_KVM_using_disk_images.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.76 @@ -242,7 +246,11 @@ seem to work just fine.

  • multimedia (13)
    • +<<<<<<< Migrating_Xen_virtual_machines_using_LVM_to_KVM_using_disk_images.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.76
  • nuug (119)
    • @@ -272,8 +280,13 @@ seem to work just fine.

  • surveillance (9)
    • +<<<<<<< Migrating_Xen_virtual_machines_using_LVM_to_KVM_using_disk_images.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.76
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Min_reprap_tar_sakte_form.html b/blog/Min_reprap_tar_sakte_form.html index decb9602bf..3db4bd9c75 100644 --- a/blog/Min_reprap_tar_sakte_form.html +++ b/blog/Min_reprap_tar_sakte_form.html @@ -87,7 +87,11 @@ arbeidet.

  • August (6)
    • +<<<<<<< Min_reprap_tar_sakte_form.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.231 @@ -201,7 +205,11 @@ arbeidet.

  • multimedia (13)
    • +<<<<<<< Min_reprap_tar_sakte_form.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.231
  • nuug (119)
    • @@ -231,8 +239,13 @@ arbeidet.

  • surveillance (9)
    • +<<<<<<< Min_reprap_tar_sakte_form.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.231
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/More_flexible_firmware_handling_in_debian_installer.html b/blog/More_flexible_firmware_handling_in_debian_installer.html index 87f7c63671..3858cdf7be 100644 --- a/blog/More_flexible_firmware_handling_in_debian_installer.html +++ b/blog/More_flexible_firmware_handling_in_debian_installer.html @@ -97,7 +97,11 @@ contact us on debian-boot@lists.debian.org.

  • August (6)
    • +<<<<<<< More_flexible_firmware_handling_in_debian_installer.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.153 @@ -211,7 +215,11 @@ contact us on debian-boot@lists.debian.org.

  • multimedia (13)
    • +<<<<<<< More_flexible_firmware_handling_in_debian_installer.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.153
  • nuug (119)
    • @@ -241,8 +249,13 @@ contact us on debian-boot@lists.debian.org.

  • surveillance (9)
    • +<<<<<<< More_flexible_firmware_handling_in_debian_installer.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.153
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/My_first_perl_GUI_application___controlling_a_Spykee_robot.html b/blog/My_first_perl_GUI_application___controlling_a_Spykee_robot.html index ca2e8e8ef1..2a7c3bc983 100644 --- a/blog/My_first_perl_GUI_application___controlling_a_Spykee_robot.html +++ b/blog/My_first_perl_GUI_application___controlling_a_Spykee_robot.html @@ -104,7 +104,11 @@ those that want to check back later to find it.

  • August (6)
    • +<<<<<<< My_first_perl_GUI_application___controlling_a_Spykee_robot.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.104 @@ -218,7 +222,11 @@ those that want to check back later to find it.

  • multimedia (13)
    • +<<<<<<< My_first_perl_GUI_application___controlling_a_Spykee_robot.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.104
  • nuug (119)
    • @@ -248,8 +256,13 @@ those that want to check back later to find it.

  • surveillance (9)
    • +<<<<<<< My_first_perl_GUI_application___controlling_a_Spykee_robot.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.104
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/N__er_74_norske_overv_kningskamera_registert_i_OpenStreetmap_org.html b/blog/N__er_74_norske_overv_kningskamera_registert_i_OpenStreetmap_org.html index c58d0a7266..a54bfb6352 100644 --- a/blog/N__er_74_norske_overv_kningskamera_registert_i_OpenStreetmap_org.html +++ b/blog/N__er_74_norske_overv_kningskamera_registert_i_OpenStreetmap_org.html @@ -77,7 +77,11 @@ kamera finnes pÃ¥ websiden for kartet hos
  • August (6)
    • +<<<<<<< N__er_74_norske_overv_kningskamera_registert_i_OpenStreetmap_org.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.2 @@ -191,7 +195,11 @@ kamera finnes pÃ¥ websiden for kartet hos
  • multimedia (13)
    • +<<<<<<< N__er_74_norske_overv_kningskamera_registert_i_OpenStreetmap_org.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.2
  • nuug (119)
    • @@ -221,8 +229,13 @@ kamera finnes pÃ¥ websiden for kartet hos
  • surveillance (9)
    • +<<<<<<< N__er_74_norske_overv_kningskamera_registert_i_OpenStreetmap_org.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.2
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Nasjonalbiblioteket_legger_ut_b_ker_p__web.html b/blog/Nasjonalbiblioteket_legger_ut_b_ker_p__web.html index 907a0edf03..a8d68ef044 100644 --- a/blog/Nasjonalbiblioteket_legger_ut_b_ker_p__web.html +++ b/blog/Nasjonalbiblioteket_legger_ut_b_ker_p__web.html @@ -82,7 +82,11 @@ fortløpende.

  • August (6)
    • +<<<<<<< Nasjonalbiblioteket_legger_ut_b_ker_p__web.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.2 @@ -196,7 +200,11 @@ fortløpende.

  • multimedia (13)
    • +<<<<<<< Nasjonalbiblioteket_legger_ut_b_ker_p__web.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.2
  • nuug (119)
    • @@ -226,8 +234,13 @@ fortløpende.

  • surveillance (9)
    • +<<<<<<< Nasjonalbiblioteket_legger_ut_b_ker_p__web.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.2
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Navteq_bruker_3_12_m_neder__OpenStreetmap_org_trenger_noen_dager.html b/blog/Navteq_bruker_3_12_m_neder__OpenStreetmap_org_trenger_noen_dager.html index 83e14f7b14..24fb136d76 100644 --- a/blog/Navteq_bruker_3_12_m_neder__OpenStreetmap_org_trenger_noen_dager.html +++ b/blog/Navteq_bruker_3_12_m_neder__OpenStreetmap_org_trenger_noen_dager.html @@ -77,7 +77,11 @@ gjøres kontinuerlig men kun regelmessing.

  • August (6)
    • +<<<<<<< Navteq_bruker_3_12_m_neder__OpenStreetmap_org_trenger_noen_dager.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.2 @@ -191,7 +195,11 @@ gjøres kontinuerlig men kun regelmessing.

  • multimedia (13)
    • +<<<<<<< Navteq_bruker_3_12_m_neder__OpenStreetmap_org_trenger_noen_dager.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.2
  • nuug (119)
    • @@ -221,8 +229,13 @@ gjøres kontinuerlig men kun regelmessing.

  • surveillance (9)
    • +<<<<<<< Navteq_bruker_3_12_m_neder__OpenStreetmap_org_trenger_noen_dager.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.2
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/No_hardcoded_config_on_Debian_Edu_clients.html b/blog/No_hardcoded_config_on_Debian_Edu_clients.html index 3f1d80fb6d..af33bf0ad0 100644 --- a/blog/No_hardcoded_config_on_Debian_Edu_clients.html +++ b/blog/No_hardcoded_config_on_Debian_Edu_clients.html @@ -172,7 +172,11 @@ implement it for Debian Edu. :)

  • August (6)
    • +<<<<<<< No_hardcoded_config_on_Debian_Edu_clients.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.115 @@ -286,7 +290,11 @@ implement it for Debian Edu. :)

  • multimedia (13)
    • +<<<<<<< No_hardcoded_config_on_Debian_Edu_clients.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.115
  • nuug (119)
    • @@ -316,8 +324,13 @@ implement it for Debian Edu. :)

  • surveillance (9)
    • +<<<<<<< No_hardcoded_config_on_Debian_Edu_clients.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.115
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/No_patch_is_not_better_than_a_useless_patch.html b/blog/No_patch_is_not_better_than_a_useless_patch.html index 0b8c78cc03..4876af4889 100644 --- a/blog/No_patch_is_not_better_than_a_useless_patch.html +++ b/blog/No_patch_is_not_better_than_a_useless_patch.html @@ -63,7 +63,11 @@ properties.

  • August (6)
    • +<<<<<<< No_patch_is_not_better_than_a_useless_patch.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.203 @@ -177,7 +181,11 @@ properties.

  • multimedia (13)
    • +<<<<<<< No_patch_is_not_better_than_a_useless_patch.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.203
  • nuug (119)
    • @@ -207,8 +215,13 @@ properties.

  • surveillance (9)
    • +<<<<<<< No_patch_is_not_better_than_a_useless_patch.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.203
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Noen_lenker_om_Datalagringsdirektivet.html b/blog/Noen_lenker_om_Datalagringsdirektivet.html index 3adaf422f5..bc505e95bd 100644 --- a/blog/Noen_lenker_om_Datalagringsdirektivet.html +++ b/blog/Noen_lenker_om_Datalagringsdirektivet.html @@ -135,7 +135,11 @@ mer.

  • August (6)
    • +<<<<<<< Noen_lenker_om_Datalagringsdirektivet.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.52 @@ -249,7 +253,11 @@ mer.

  • multimedia (13)
    • +<<<<<<< Noen_lenker_om_Datalagringsdirektivet.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.52
  • nuug (119)
    • @@ -279,8 +287,13 @@ mer.

  • surveillance (9)
    • +<<<<<<< Noen_lenker_om_Datalagringsdirektivet.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.52
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Norge_trenger_en_personvernforening.html b/blog/Norge_trenger_en_personvernforening.html index 18aa356333..eb8038cd7f 100644 --- a/blog/Norge_trenger_en_personvernforening.html +++ b/blog/Norge_trenger_en_personvernforening.html @@ -69,7 +69,11 @@ nÃ¥ fÃ¥r vi se om noen er enig.

  • August (6)
    • +<<<<<<< Norge_trenger_en_personvernforening.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.232 @@ -183,7 +187,11 @@ nÃ¥ fÃ¥r vi se om noen er enig.

  • multimedia (13)
    • +<<<<<<< Norge_trenger_en_personvernforening.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.232
  • nuug (119)
    • @@ -213,8 +221,13 @@ nÃ¥ fÃ¥r vi se om noen er enig.

  • surveillance (9)
    • +<<<<<<< Norge_trenger_en_personvernforening.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.232
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Norgeskartet_p__mange_vis___via_OpenStreetmap_org.html b/blog/Norgeskartet_p__mange_vis___via_OpenStreetmap_org.html index 566422f99e..8431f1a122 100644 --- a/blog/Norgeskartet_p__mange_vis___via_OpenStreetmap_org.html +++ b/blog/Norgeskartet_p__mange_vis___via_OpenStreetmap_org.html @@ -85,7 +85,11 @@ dermed være noe for enhver smak.

  • August (6)
    • +<<<<<<< Norgeskartet_p__mange_vis___via_OpenStreetmap_org.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.2 @@ -199,7 +203,11 @@ dermed være noe for enhver smak.

  • multimedia (13)
    • +<<<<<<< Norgeskartet_p__mange_vis___via_OpenStreetmap_org.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.2
  • nuug (119)
    • @@ -229,8 +237,13 @@ dermed være noe for enhver smak.

  • surveillance (9)
    • +<<<<<<< Norgeskartet_p__mange_vis___via_OpenStreetmap_org.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.2
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Now_accepting_bitcoins___anonymous_and_distributed_p2p_crypto_money.html b/blog/Now_accepting_bitcoins___anonymous_and_distributed_p2p_crypto_money.html index 8a80518572..09d871239e 100644 --- a/blog/Now_accepting_bitcoins___anonymous_and_distributed_p2p_crypto_money.html +++ b/blog/Now_accepting_bitcoins___anonymous_and_distributed_p2p_crypto_money.html @@ -98,7 +98,11 @@ donations to the address
  • August (6)
    • +<<<<<<< Now_accepting_bitcoins___anonymous_and_distributed_p2p_crypto_money.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.69 @@ -212,7 +216,11 @@ donations to the address
  • multimedia (13)
    • +<<<<<<< Now_accepting_bitcoins___anonymous_and_distributed_p2p_crypto_money.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.69
  • nuug (119)
    • @@ -242,8 +250,13 @@ donations to the address
  • surveillance (9)
    • +<<<<<<< Now_accepting_bitcoins___anonymous_and_distributed_p2p_crypto_money.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.69
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/ODF_bruk_i_staten__ikke_helt_p__plass.html b/blog/ODF_bruk_i_staten__ikke_helt_p__plass.html index bb88908738..41c0a70881 100644 --- a/blog/ODF_bruk_i_staten__ikke_helt_p__plass.html +++ b/blog/ODF_bruk_i_staten__ikke_helt_p__plass.html @@ -69,7 +69,11 @@ Kjenner kun til ufullstendige løsninger for slikt.

  • August (6)
    • +<<<<<<< ODF_bruk_i_staten__ikke_helt_p__plass.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.2 @@ -183,7 +187,11 @@ Kjenner kun til ufullstendige løsninger for slikt.

  • multimedia (13)
    • +<<<<<<< ODF_bruk_i_staten__ikke_helt_p__plass.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.2
  • nuug (119)
    • @@ -213,8 +221,13 @@ Kjenner kun til ufullstendige løsninger for slikt.

  • surveillance (9)
    • +<<<<<<< ODF_bruk_i_staten__ikke_helt_p__plass.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.2
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Officeshots_still_going_strong.html b/blog/Officeshots_still_going_strong.html index 9a902bdf10..c8df380542 100644 --- a/blog/Officeshots_still_going_strong.html +++ b/blog/Officeshots_still_going_strong.html @@ -69,7 +69,11 @@ got such a great test tool available.

  • August (6)
    • +<<<<<<< Officeshots_still_going_strong.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.63 @@ -183,7 +187,11 @@ got such a great test tool available.

  • multimedia (13)
    • +<<<<<<< Officeshots_still_going_strong.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.63
  • nuug (119)
    • @@ -213,8 +221,13 @@ got such a great test tool available.

  • surveillance (9)
    • +<<<<<<< Officeshots_still_going_strong.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.63
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Officeshots_taking_shape.html b/blog/Officeshots_taking_shape.html index a742baa5a0..f5ce96b229 100644 --- a/blog/Officeshots_taking_shape.html +++ b/blog/Officeshots_taking_shape.html @@ -78,7 +78,11 @@ Windows. This is great.

  • August (6)
    • +<<<<<<< Officeshots_taking_shape.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.137 @@ -192,7 +196,11 @@ Windows. This is great.

  • multimedia (13)
    • +<<<<<<< Officeshots_taking_shape.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.137
  • nuug (119)
    • @@ -222,8 +230,13 @@ Windows. This is great.

  • surveillance (9)
    • +<<<<<<< Officeshots_taking_shape.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.137
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/One_step_closer_to_single_signon_in_Debian_Edu.html b/blog/One_step_closer_to_single_signon_in_Debian_Edu.html index 2a8c751720..e851082d10 100644 --- a/blog/One_step_closer_to_single_signon_in_Debian_Edu.html +++ b/blog/One_step_closer_to_single_signon_in_Debian_Edu.html @@ -91,7 +91,11 @@ please contact us on debian-edu@lists.debian.org.

  • August (6)
    • +<<<<<<< One_step_closer_to_single_signon_in_Debian_Edu.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.124 @@ -205,7 +209,11 @@ please contact us on debian-edu@lists.debian.org.

  • multimedia (13)
    • +<<<<<<< One_step_closer_to_single_signon_in_Debian_Edu.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.124
  • nuug (119)
    • @@ -235,8 +243,13 @@ please contact us on debian-edu@lists.debian.org.

  • surveillance (9)
    • +<<<<<<< One_step_closer_to_single_signon_in_Debian_Edu.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.124
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/OpenStreetmap_one_step_closer_to_having_routing_on_its_front_page.html b/blog/OpenStreetmap_one_step_closer_to_having_routing_on_its_front_page.html index 54c438c6b0..c8cad6b9ef 100644 --- a/blog/OpenStreetmap_one_step_closer_to_having_routing_on_its_front_page.html +++ b/blog/OpenStreetmap_one_step_closer_to_having_routing_on_its_front_page.html @@ -72,7 +72,11 @@ www.openstreetmap.org front page.

  • August (6)
    • +<<<<<<< OpenStreetmap_one_step_closer_to_having_routing_on_its_front_page.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.123 @@ -186,7 +190,11 @@ www.openstreetmap.org front page.

  • multimedia (13)
    • +<<<<<<< OpenStreetmap_one_step_closer_to_having_routing_on_its_front_page.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.123
  • nuug (119)
    • @@ -216,8 +224,13 @@ www.openstreetmap.org front page.

  • surveillance (9)
    • +<<<<<<< OpenStreetmap_one_step_closer_to_having_routing_on_its_front_page.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.123
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Oppdatert_kart_over_overv_kningskamera_i_Norge.html b/blog/Oppdatert_kart_over_overv_kningskamera_i_Norge.html index c3db4dba33..356a371165 100644 --- a/blog/Oppdatert_kart_over_overv_kningskamera_i_Norge.html +++ b/blog/Oppdatert_kart_over_overv_kningskamera_i_Norge.html @@ -71,7 +71,11 @@ OSM-dumpen for Norge.

  • August (6)
    • +<<<<<<< Oppdatert_kart_over_overv_kningskamera_i_Norge.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.2 @@ -185,7 +189,11 @@ OSM-dumpen for Norge.

  • multimedia (13)
    • +<<<<<<< Oppdatert_kart_over_overv_kningskamera_i_Norge.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.2
  • nuug (119)
    • @@ -215,8 +223,13 @@ OSM-dumpen for Norge.

  • surveillance (9)
    • +<<<<<<< Oppdatert_kart_over_overv_kningskamera_i_Norge.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.2
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Opphavet_til_Skolelinux_prosjektet.html b/blog/Opphavet_til_Skolelinux_prosjektet.html index 49fae0919e..a546527cae 100644 --- a/blog/Opphavet_til_Skolelinux_prosjektet.html +++ b/blog/Opphavet_til_Skolelinux_prosjektet.html @@ -84,7 +84,11 @@ Resten er historie. :)

  • August (6)
    • +<<<<<<< Opphavet_til_Skolelinux_prosjektet.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.175 @@ -198,7 +202,11 @@ Resten er historie. :)

  • multimedia (13)
    • +<<<<<<< Opphavet_til_Skolelinux_prosjektet.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.175
  • nuug (119)
    • @@ -228,8 +236,13 @@ Resten er historie. :)

  • surveillance (9)
    • +<<<<<<< Opphavet_til_Skolelinux_prosjektet.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.175
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Overv_kningslogikkens_fallitt.html b/blog/Overv_kningslogikkens_fallitt.html index 0354cb9014..d21b0d40fb 100644 --- a/blog/Overv_kningslogikkens_fallitt.html +++ b/blog/Overv_kningslogikkens_fallitt.html @@ -83,7 +83,11 @@ jeg tror bidrar til Ã¥ holde ekstreme holdninger i sjakk.

  • August (6)
    • +<<<<<<< Overv_kningslogikkens_fallitt.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.2 @@ -197,7 +201,11 @@ jeg tror bidrar til Ã¥ holde ekstreme holdninger i sjakk.

  • multimedia (13)
    • +<<<<<<< Overv_kningslogikkens_fallitt.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.2
  • nuug (119)
    • @@ -227,8 +235,13 @@ jeg tror bidrar til Ã¥ holde ekstreme holdninger i sjakk.

  • surveillance (9)
    • +<<<<<<< Overv_kningslogikkens_fallitt.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.2
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/P__vegne_av_vanvitting_mange__Aftenposten_.html b/blog/P__vegne_av_vanvitting_mange__Aftenposten_.html index 2d8ed5d2a8..64baaac62c 100644 --- a/blog/P__vegne_av_vanvitting_mange__Aftenposten_.html +++ b/blog/P__vegne_av_vanvitting_mange__Aftenposten_.html @@ -66,7 +66,11 @@ Hr. Fossen. MÃ¥ innrømme at jeg tviler pÃ¥ det.

  • August (6)
    • +<<<<<<< P__vegne_av_vanvitting_mange__Aftenposten_.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.2 @@ -180,7 +184,11 @@ Hr. Fossen. MÃ¥ innrømme at jeg tviler pÃ¥ det.

  • multimedia (13)
    • +<<<<<<< P__vegne_av_vanvitting_mange__Aftenposten_.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.2
  • nuug (119)
    • @@ -210,8 +218,13 @@ Hr. Fossen. MÃ¥ innrømme at jeg tviler pÃ¥ det.

  • surveillance (9)
    • +<<<<<<< P__vegne_av_vanvitting_mange__Aftenposten_.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.2
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Parallellized_boot_is_now_the_default_in_Debian_unstable.html b/blog/Parallellized_boot_is_now_the_default_in_Debian_unstable.html index 48da7c09a0..3d626762fc 100644 --- a/blog/Parallellized_boot_is_now_the_default_in_Debian_unstable.html +++ b/blog/Parallellized_boot_is_now_the_default_in_Debian_unstable.html @@ -82,7 +82,11 @@ list of usertagged bugs related to this.

  • August (6)
    • +<<<<<<< Parallellized_boot_is_now_the_default_in_Debian_unstable.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.156 @@ -196,7 +200,11 @@ list of usertagged bugs related to this.

  • multimedia (13)
    • +<<<<<<< Parallellized_boot_is_now_the_default_in_Debian_unstable.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.156
  • nuug (119)
    • @@ -226,8 +234,13 @@ list of usertagged bugs related to this.

  • surveillance (9)
    • +<<<<<<< Parallellized_boot_is_now_the_default_in_Debian_unstable.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.156
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Parallellized_boot_seem_to_hold_up_well_in_Debian_testing.html b/blog/Parallellized_boot_seem_to_hold_up_well_in_Debian_testing.html index 7c53698054..cecd174c8e 100644 --- a/blog/Parallellized_boot_seem_to_hold_up_well_in_Debian_testing.html +++ b/blog/Parallellized_boot_seem_to_hold_up_well_in_Debian_testing.html @@ -95,7 +95,11 @@ list of usertagged bugs related to this.

  • August (6)
    • +<<<<<<< Parallellized_boot_seem_to_hold_up_well_in_Debian_testing.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.154 @@ -209,7 +213,11 @@ list of usertagged bugs related to this.

  • multimedia (13)
    • +<<<<<<< Parallellized_boot_seem_to_hold_up_well_in_Debian_testing.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.154
  • nuug (119)
    • @@ -239,8 +247,13 @@ list of usertagged bugs related to this.

  • surveillance (9)
    • +<<<<<<< Parallellized_boot_seem_to_hold_up_well_in_Debian_testing.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.154
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Parallellizing_the_boot_in_Debian_Squeeze___ready_for_wider_testing.html b/blog/Parallellizing_the_boot_in_Debian_Squeeze___ready_for_wider_testing.html index f05dc2859a..cfed73793a 100644 --- a/blog/Parallellizing_the_boot_in_Debian_Squeeze___ready_for_wider_testing.html +++ b/blog/Parallellizing_the_boot_in_Debian_Squeeze___ready_for_wider_testing.html @@ -91,7 +91,11 @@ list of usertagged bugs related to this.

  • August (6)
    • +<<<<<<< Parallellizing_the_boot_in_Debian_Squeeze___ready_for_wider_testing.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.159 @@ -205,7 +209,11 @@ list of usertagged bugs related to this.

  • multimedia (13)
    • +<<<<<<< Parallellizing_the_boot_in_Debian_Squeeze___ready_for_wider_testing.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.159
  • nuug (119)
    • @@ -235,8 +243,13 @@ list of usertagged bugs related to this.

  • surveillance (9)
    • +<<<<<<< Parallellizing_the_boot_in_Debian_Squeeze___ready_for_wider_testing.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.159
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Perl_modules_used_by_FixMyStreet_which_are_missing_in_Debian_Squeeze.html b/blog/Perl_modules_used_by_FixMyStreet_which_are_missing_in_Debian_Squeeze.html index e11eb7996d..ec321ae1f8 100644 --- a/blog/Perl_modules_used_by_FixMyStreet_which_are_missing_in_Debian_Squeeze.html +++ b/blog/Perl_modules_used_by_FixMyStreet_which_are_missing_in_Debian_Squeeze.html @@ -80,7 +80,11 @@ do not have time for.

  • August (6)
    • +<<<<<<< Perl_modules_used_by_FixMyStreet_which_are_missing_in_Debian_Squeeze.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.13 @@ -194,7 +198,11 @@ do not have time for.

  • multimedia (13)
    • +<<<<<<< Perl_modules_used_by_FixMyStreet_which_are_missing_in_Debian_Squeeze.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.13
  • nuug (119)
    • @@ -224,8 +232,13 @@ do not have time for.

  • surveillance (9)
    • +<<<<<<< Perl_modules_used_by_FixMyStreet_which_are_missing_in_Debian_Squeeze.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.13
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Pieces_of_the_roaming_laptop_puzzle_in_Debian.html b/blog/Pieces_of_the_roaming_laptop_puzzle_in_Debian.html index ad8b5b8932..03dfc6c725 100644 --- a/blog/Pieces_of_the_roaming_laptop_puzzle_in_Debian.html +++ b/blog/Pieces_of_the_roaming_laptop_puzzle_in_Debian.html @@ -107,7 +107,11 @@ please contact us on debian-edu@lists.debian.org.

  • August (6)
    • +<<<<<<< Pieces_of_the_roaming_laptop_puzzle_in_Debian.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.154 @@ -221,7 +225,11 @@ please contact us on debian-edu@lists.debian.org.

  • multimedia (13)
    • +<<<<<<< Pieces_of_the_roaming_laptop_puzzle_in_Debian.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.154
  • nuug (119)
    • @@ -251,8 +259,13 @@ please contact us on debian-edu@lists.debian.org.

  • surveillance (9)
    • +<<<<<<< Pieces_of_the_roaming_laptop_puzzle_in_Debian.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.154
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Pledge_for_funding_to_the_Gnash_project_to_get_AVM2_support.html b/blog/Pledge_for_funding_to_the_Gnash_project_to_get_AVM2_support.html index ba16bb2615..cbacfd9d35 100644 --- a/blog/Pledge_for_funding_to_the_Gnash_project_to_get_AVM2_support.html +++ b/blog/Pledge_for_funding_to_the_Gnash_project_to_get_AVM2_support.html @@ -98,7 +98,11 @@ project gets, the more features it can develop using these funds.
  • August (6)
    • +<<<<<<< Pledge_for_funding_to_the_Gnash_project_to_get_AVM2_support.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.88 @@ -212,7 +216,11 @@ project gets, the more features it can develop using these funds.
  • multimedia (13)
    • +<<<<<<< Pledge_for_funding_to_the_Gnash_project_to_get_AVM2_support.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.88
  • nuug (119)
    • @@ -242,8 +250,13 @@ project gets, the more features it can develop using these funds.
  • surveillance (9)
    • +<<<<<<< Pledge_for_funding_to_the_Gnash_project_to_get_AVM2_support.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.88
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Pornoskannerne_p__flyplassene_bedrer_visst_ikke_sikkerheten.html b/blog/Pornoskannerne_p__flyplassene_bedrer_visst_ikke_sikkerheten.html index 829ef00101..b1897d0a02 100644 --- a/blog/Pornoskannerne_p__flyplassene_bedrer_visst_ikke_sikkerheten.html +++ b/blog/Pornoskannerne_p__flyplassene_bedrer_visst_ikke_sikkerheten.html @@ -74,7 +74,11 @@ kan.

  • August (6)
    • +<<<<<<< Pornoskannerne_p__flyplassene_bedrer_visst_ikke_sikkerheten.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.2 @@ -188,7 +192,11 @@ kan.

  • multimedia (13)
    • +<<<<<<< Pornoskannerne_p__flyplassene_bedrer_visst_ikke_sikkerheten.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.2
  • nuug (119)
    • @@ -218,8 +226,13 @@ kan.

  • surveillance (9)
    • +<<<<<<< Pornoskannerne_p__flyplassene_bedrer_visst_ikke_sikkerheten.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.2
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Radiomerking_med_RFID.html b/blog/Radiomerking_med_RFID.html index b72cbb939a..6118572fb4 100644 --- a/blog/Radiomerking_med_RFID.html +++ b/blog/Radiomerking_med_RFID.html @@ -105,7 +105,11 @@ mer om de nye biometriske passene.

  • August (6)
    • +<<<<<<< Radiomerking_med_RFID.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.46 @@ -219,7 +223,11 @@ mer om de nye biometriske passene.

  • multimedia (13)
    • +<<<<<<< Radiomerking_med_RFID.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.46
  • nuug (119)
    • @@ -249,8 +257,13 @@ mer om de nye biometriske passene.

  • surveillance (9)
    • +<<<<<<< Radiomerking_med_RFID.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.46
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Recording_video_from_cron_using_VLC.html b/blog/Recording_video_from_cron_using_VLC.html index 3d530b2179..005f04e71a 100644 --- a/blog/Recording_video_from_cron_using_VLC.html +++ b/blog/Recording_video_from_cron_using_VLC.html @@ -93,7 +93,11 @@ wait $pid
  • August (6)
    • +<<<<<<< Recording_video_from_cron_using_VLC.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.213 @@ -207,7 +211,11 @@ wait $pid
  • multimedia (13)
    • +<<<<<<< Recording_video_from_cron_using_VLC.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.213
  • nuug (119)
    • @@ -237,8 +245,13 @@ wait $pid
  • surveillance (9)
    • +<<<<<<< Recording_video_from_cron_using_VLC.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.213
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Regjeringen_vil_gj_re_offentlighetsloven_mer_tannl_s.html b/blog/Regjeringen_vil_gj_re_offentlighetsloven_mer_tannl_s.html index 035476c3ad..d6e1857e6c 100644 --- a/blog/Regjeringen_vil_gj_re_offentlighetsloven_mer_tannl_s.html +++ b/blog/Regjeringen_vil_gj_re_offentlighetsloven_mer_tannl_s.html @@ -74,7 +74,11 @@ offentlige bør skrinlegges.

  • August (6)
    • +<<<<<<< Regjeringen_vil_gj_re_offentlighetsloven_mer_tannl_s.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.2 @@ -188,7 +192,11 @@ offentlige bør skrinlegges.

  • multimedia (13)
    • +<<<<<<< Regjeringen_vil_gj_re_offentlighetsloven_mer_tannl_s.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.2
  • nuug (119)
    • @@ -218,8 +226,13 @@ offentlige bør skrinlegges.

  • surveillance (9)
    • +<<<<<<< Regjeringen_vil_gj_re_offentlighetsloven_mer_tannl_s.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.2
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Regjerningen_forlater_prinsippet_om_ingen_royalty_betaling_i_standardkatalogen_versjon_2.html b/blog/Regjerningen_forlater_prinsippet_om_ingen_royalty_betaling_i_standardkatalogen_versjon_2.html index 96aca3938a..8713604883 100644 --- a/blog/Regjerningen_forlater_prinsippet_om_ingen_royalty_betaling_i_standardkatalogen_versjon_2.html +++ b/blog/Regjerningen_forlater_prinsippet_om_ingen_royalty_betaling_i_standardkatalogen_versjon_2.html @@ -85,7 +85,11 @@ høringsuttalelse, men ser ut til Ã¥ ha blitt ignorert.

  • August (6)
    • +<<<<<<< Regjerningen_forlater_prinsippet_om_ingen_royalty_betaling_i_standardkatalogen_versjon_2.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.189 @@ -199,7 +203,11 @@ høringsuttalelse, men ser ut til Ã¥ ha blitt ignorert.

  • multimedia (13)
    • +<<<<<<< Regjerningen_forlater_prinsippet_om_ingen_royalty_betaling_i_standardkatalogen_versjon_2.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.189
  • nuug (119)
    • @@ -229,8 +237,13 @@ høringsuttalelse, men ser ut til Ã¥ ha blitt ignorert.

  • surveillance (9)
    • +<<<<<<< Regjerningen_forlater_prinsippet_om_ingen_royalty_betaling_i_standardkatalogen_versjon_2.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.189
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Regjerningens_oppsummering_av_h_ringen_om_standardkatalogen_versjon_2.html b/blog/Regjerningens_oppsummering_av_h_ringen_om_standardkatalogen_versjon_2.html index ee7dba9e16..cfea3ada1b 100644 --- a/blog/Regjerningens_oppsummering_av_h_ringen_om_standardkatalogen_versjon_2.html +++ b/blog/Regjerningens_oppsummering_av_h_ringen_om_standardkatalogen_versjon_2.html @@ -76,7 +76,11 @@ politidirektoratet om patentproblemer i Theora).

  • August (6)
    • +<<<<<<< Regjerningens_oppsummering_av_h_ringen_om_standardkatalogen_versjon_2.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.2 @@ -190,7 +194,11 @@ politidirektoratet om patentproblemer i Theora).

  • multimedia (13)
    • +<<<<<<< Regjerningens_oppsummering_av_h_ringen_om_standardkatalogen_versjon_2.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.2
  • nuug (119)
    • @@ -220,8 +228,13 @@ politidirektoratet om patentproblemer i Theora).

  • surveillance (9)
    • +<<<<<<< Regjerningens_oppsummering_av_h_ringen_om_standardkatalogen_versjon_2.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.2
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Relative_popularity_of_document_formats__MS_Office_vs__ODF_.html b/blog/Relative_popularity_of_document_formats__MS_Office_vs__ODF_.html index ec4f988a58..f875ff900d 100644 --- a/blog/Relative_popularity_of_document_formats__MS_Office_vs__ODF_.html +++ b/blog/Relative_popularity_of_document_formats__MS_Office_vs__ODF_.html @@ -105,7 +105,11 @@ numbers.

  • August (6)
    • +<<<<<<< Relative_popularity_of_document_formats__MS_Office_vs__ODF_.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.184 @@ -219,7 +223,11 @@ numbers.

  • multimedia (13)
    • +<<<<<<< Relative_popularity_of_document_formats__MS_Office_vs__ODF_.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.184
  • nuug (119)
    • @@ -249,8 +257,13 @@ numbers.

  • surveillance (9)
    • +<<<<<<< Relative_popularity_of_document_formats__MS_Office_vs__ODF_.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.184
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Reprap_bygging_i_p_sken.html b/blog/Reprap_bygging_i_p_sken.html index febc083e5d..f3831d119c 100644 --- a/blog/Reprap_bygging_i_p_sken.html +++ b/blog/Reprap_bygging_i_p_sken.html @@ -109,7 +109,11 @@ kommer til Ã¥ bruke denne plasttypen som hÃ¥ndterer temperaturer mellom
  • August (6)
    • +<<<<<<< Reprap_bygging_i_p_sken.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.2 @@ -223,7 +227,11 @@ kommer til Ã¥ bruke denne plasttypen som hÃ¥ndterer temperaturer mellom
  • multimedia (13)
    • +<<<<<<< Reprap_bygging_i_p_sken.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.2
  • nuug (119)
    • @@ -253,8 +261,13 @@ kommer til Ã¥ bruke denne plasttypen som hÃ¥ndterer temperaturer mellom
  • surveillance (9)
    • +<<<<<<< Reprap_bygging_i_p_sken.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.2
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Reprap_pakke_tapt_i_posten.html b/blog/Reprap_pakke_tapt_i_posten.html index 8a1c8141df..cbf9e92cf4 100644 --- a/blog/Reprap_pakke_tapt_i_posten.html +++ b/blog/Reprap_pakke_tapt_i_posten.html @@ -65,7 +65,11 @@ lenge alt er klart til Go Open
  • August (6)
    • +<<<<<<< Reprap_pakke_tapt_i_posten.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.250 @@ -179,7 +183,11 @@ lenge alt er klart til Go Open
  • multimedia (13)
    • +<<<<<<< Reprap_pakke_tapt_i_posten.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.250
  • nuug (119)
    • @@ -209,8 +217,13 @@ lenge alt er klart til Go Open
  • surveillance (9)
    • +<<<<<<< Reprap_pakke_tapt_i_posten.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.250
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Returning_from_Skolelinux_developer_gathering.html b/blog/Returning_from_Skolelinux_developer_gathering.html index 5e43214c50..673ef79ba5 100644 --- a/blog/Returning_from_Skolelinux_developer_gathering.html +++ b/blog/Returning_from_Skolelinux_developer_gathering.html @@ -71,7 +71,11 @@ now. :)

  • August (6)
    • +<<<<<<< Returning_from_Skolelinux_developer_gathering.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.215 @@ -185,7 +189,11 @@ now. :)

  • multimedia (13)
    • +<<<<<<< Returning_from_Skolelinux_developer_gathering.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.215
  • nuug (119)
    • @@ -215,8 +223,13 @@ now. :)

  • surveillance (9)
    • +<<<<<<< Returning_from_Skolelinux_developer_gathering.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.215
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Rob_Weir__How_to_Crush_Dissent.html b/blog/Rob_Weir__How_to_Crush_Dissent.html index 2a63672572..5faa96773a 100644 --- a/blog/Rob_Weir__How_to_Crush_Dissent.html +++ b/blog/Rob_Weir__How_to_Crush_Dissent.html @@ -62,7 +62,11 @@ long time.

  • August (6)
    • +<<<<<<< Rob_Weir__How_to_Crush_Dissent.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.113 @@ -176,7 +180,11 @@ long time.

  • multimedia (13)
    • +<<<<<<< Rob_Weir__How_to_Crush_Dissent.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.113
  • nuug (119)
    • @@ -206,8 +214,13 @@ long time.

  • surveillance (9)
    • +<<<<<<< Rob_Weir__How_to_Crush_Dissent.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.113
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Robot__reis_deg___.html b/blog/Robot__reis_deg___.html index 37b21829c1..747f65297f 100644 --- a/blog/Robot__reis_deg___.html +++ b/blog/Robot__reis_deg___.html @@ -94,7 +94,11 @@ der hvis du er nysgjerrig.

  • August (6)
    • +<<<<<<< Robot__reis_deg___.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.111 @@ -208,7 +212,11 @@ der hvis du er nysgjerrig.

  • multimedia (13)
    • +<<<<<<< Robot__reis_deg___.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.111
  • nuug (119)
    • @@ -238,8 +246,13 @@ der hvis du er nysgjerrig.

  • surveillance (9)
    • +<<<<<<< Robot__reis_deg___.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.111
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Sikkerhet__teater__og_hvordan_gj_re_verden_sikrere.html b/blog/Sikkerhet__teater__og_hvordan_gj_re_verden_sikrere.html index 60b70f023e..afe6ebee8a 100644 --- a/blog/Sikkerhet__teater__og_hvordan_gj_re_verden_sikrere.html +++ b/blog/Sikkerhet__teater__og_hvordan_gj_re_verden_sikrere.html @@ -67,7 +67,11 @@ pÃ¥ flyplassene.

  • August (6)
    • +<<<<<<< Sikkerhet__teater__og_hvordan_gj_re_verden_sikrere.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.2 @@ -181,7 +185,11 @@ pÃ¥ flyplassene.

  • multimedia (13)
    • +<<<<<<< Sikkerhet__teater__og_hvordan_gj_re_verden_sikrere.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.2
  • nuug (119)
    • @@ -211,8 +219,13 @@ pÃ¥ flyplassene.

  • surveillance (9)
    • +<<<<<<< Sikkerhet__teater__og_hvordan_gj_re_verden_sikrere.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.2
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Sikkerhet_til_sj_s_trenger_sj_kart_uten_bruksbegresninger.html b/blog/Sikkerhet_til_sj_s_trenger_sj_kart_uten_bruksbegresninger.html index 7503a6a3ab..23709211b7 100644 --- a/blog/Sikkerhet_til_sj_s_trenger_sj_kart_uten_bruksbegresninger.html +++ b/blog/Sikkerhet_til_sj_s_trenger_sj_kart_uten_bruksbegresninger.html @@ -109,7 +109,11 @@ det viser at behovet for fribruks-sjøkart er til stedet.

  • August (6)
    • +<<<<<<< Sikkerhet_til_sj_s_trenger_sj_kart_uten_bruksbegresninger.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.4 @@ -223,7 +227,11 @@ det viser at behovet for fribruks-sjøkart er til stedet.

  • multimedia (13)
    • +<<<<<<< Sikkerhet_til_sj_s_trenger_sj_kart_uten_bruksbegresninger.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.4
  • nuug (119)
    • @@ -253,8 +261,13 @@ det viser at behovet for fribruks-sjøkart er til stedet.

  • surveillance (9)
    • +<<<<<<< Sikkerhet_til_sj_s_trenger_sj_kart_uten_bruksbegresninger.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.4
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Sikkerhetsteateret_p__flyplassene_fortsetter.html b/blog/Sikkerhetsteateret_p__flyplassene_fortsetter.html index 8e5cde36e1..91de386e0a 100644 --- a/blog/Sikkerhetsteateret_p__flyplassene_fortsetter.html +++ b/blog/Sikkerhetsteateret_p__flyplassene_fortsetter.html @@ -85,7 +85,11 @@ en god ting sett fra et miljøperspektiv, men det er en annen sak.

  • August (6)
    • +<<<<<<< Sikkerhetsteateret_p__flyplassene_fortsetter.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.2 @@ -199,7 +203,11 @@ en god ting sett fra et miljøperspektiv, men det er en annen sak.

  • multimedia (13)
    • +<<<<<<< Sikkerhetsteateret_p__flyplassene_fortsetter.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.2
  • nuug (119)
    • @@ -229,8 +237,13 @@ en god ting sett fra et miljøperspektiv, men det er en annen sak.

  • surveillance (9)
    • +<<<<<<< Sikkerhetsteateret_p__flyplassene_fortsetter.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.2
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Sitesummary_tip__Listing_MAC_address_of_all_clients.html b/blog/Sitesummary_tip__Listing_MAC_address_of_all_clients.html index 3cb958dffe..1fa0ec23cf 100644 --- a/blog/Sitesummary_tip__Listing_MAC_address_of_all_clients.html +++ b/blog/Sitesummary_tip__Listing_MAC_address_of_all_clients.html @@ -81,7 +81,11 @@ written yet.

  • August (6)
    • +<<<<<<< Sitesummary_tip__Listing_MAC_address_of_all_clients.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.157 @@ -195,7 +199,11 @@ written yet.

  • multimedia (13)
    • +<<<<<<< Sitesummary_tip__Listing_MAC_address_of_all_clients.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.157
  • nuug (119)
    • @@ -225,8 +233,13 @@ written yet.

  • surveillance (9)
    • +<<<<<<< Sitesummary_tip__Listing_MAC_address_of_all_clients.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.157
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Sitesummary_tip__Listing_computer_hardware_models_used_at_site.html b/blog/Sitesummary_tip__Listing_computer_hardware_models_used_at_site.html index e7319254f7..cb72f0459f 100644 --- a/blog/Sitesummary_tip__Listing_computer_hardware_models_used_at_site.html +++ b/blog/Sitesummary_tip__Listing_computer_hardware_models_used_at_site.html @@ -88,7 +88,11 @@ collector.

  • August (6)
    • +<<<<<<< Sitesummary_tip__Listing_computer_hardware_models_used_at_site.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.147 @@ -202,7 +206,11 @@ collector.

  • multimedia (13)
    • +<<<<<<< Sitesummary_tip__Listing_computer_hardware_models_used_at_site.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.147
  • nuug (119)
    • @@ -232,8 +240,13 @@ collector.

  • surveillance (9)
    • +<<<<<<< Sitesummary_tip__Listing_computer_hardware_models_used_at_site.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.147
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Skolelinux_er_laget_for_sentraldrifting__naturligvis.html b/blog/Skolelinux_er_laget_for_sentraldrifting__naturligvis.html index b7495ae00b..694f07a968 100644 --- a/blog/Skolelinux_er_laget_for_sentraldrifting__naturligvis.html +++ b/blog/Skolelinux_er_laget_for_sentraldrifting__naturligvis.html @@ -133,7 +133,11 @@ minner.

  • August (6)
    • +<<<<<<< Skolelinux_er_laget_for_sentraldrifting__naturligvis.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.146 @@ -247,7 +251,11 @@ minner.

  • multimedia (13)
    • +<<<<<<< Skolelinux_er_laget_for_sentraldrifting__naturligvis.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.146
  • nuug (119)
    • @@ -277,8 +285,13 @@ minner.

  • surveillance (9)
    • +<<<<<<< Skolelinux_er_laget_for_sentraldrifting__naturligvis.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.146
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Skolelinux_i_Osloskolen.html b/blog/Skolelinux_i_Osloskolen.html index c2008c7297..a7b9dac196 100644 --- a/blog/Skolelinux_i_Osloskolen.html +++ b/blog/Skolelinux_i_Osloskolen.html @@ -75,7 +75,11 @@ brukerprogrammene som er tilgjengelig i Skolelinux.

  • August (6)
    • +<<<<<<< Skolelinux_i_Osloskolen.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.108 @@ -189,7 +193,11 @@ brukerprogrammene som er tilgjengelig i Skolelinux.

  • multimedia (13)
    • +<<<<<<< Skolelinux_i_Osloskolen.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.108
  • nuug (119)
    • @@ -219,8 +227,13 @@ brukerprogrammene som er tilgjengelig i Skolelinux.

  • surveillance (9)
    • +<<<<<<< Skolelinux_i_Osloskolen.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.108
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Skolelinux_intervju__Arnt_Ove_Gregersen.html b/blog/Skolelinux_intervju__Arnt_Ove_Gregersen.html index 1bbf0b09a2..0168714933 100644 --- a/blog/Skolelinux_intervju__Arnt_Ove_Gregersen.html +++ b/blog/Skolelinux_intervju__Arnt_Ove_Gregersen.html @@ -134,7 +134,11 @@ veldig bra utvalg av gratis spill som er av høy kvalitet. Veldig lett
  • August (6)
    • +<<<<<<< Skolelinux_intervju__Arnt_Ove_Gregersen.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.52 @@ -248,7 +252,11 @@ veldig bra utvalg av gratis spill som er av høy kvalitet. Veldig lett
  • multimedia (13)
    • +<<<<<<< Skolelinux_intervju__Arnt_Ove_Gregersen.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.52
  • nuug (119)
    • @@ -278,8 +286,13 @@ veldig bra utvalg av gratis spill som er av høy kvalitet. Veldig lett
  • surveillance (9)
    • +<<<<<<< Skolelinux_intervju__Arnt_Ove_Gregersen.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.52
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Skolelinux_intervju__Astri_Sletteng.html b/blog/Skolelinux_intervju__Astri_Sletteng.html index 30277f27a5..f0e753c691 100644 --- a/blog/Skolelinux_intervju__Astri_Sletteng.html +++ b/blog/Skolelinux_intervju__Astri_Sletteng.html @@ -121,7 +121,11 @@ er en god strategi Ã¥ bruke.

  • August (6)
    • +<<<<<<< Skolelinux_intervju__Astri_Sletteng.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.34 @@ -235,7 +239,11 @@ er en god strategi Ã¥ bruke.

  • multimedia (13)
    • +<<<<<<< Skolelinux_intervju__Astri_Sletteng.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.34
  • nuug (119)
    • @@ -265,8 +273,13 @@ er en god strategi Ã¥ bruke.

  • surveillance (9)
    • +<<<<<<< Skolelinux_intervju__Astri_Sletteng.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.34
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Skolelinux_intervju__Embrik_Kaslegard.html b/blog/Skolelinux_intervju__Embrik_Kaslegard.html index ae07f34e0b..dab9de20bb 100644 --- a/blog/Skolelinux_intervju__Embrik_Kaslegard.html +++ b/blog/Skolelinux_intervju__Embrik_Kaslegard.html @@ -147,7 +147,11 @@ spørsmÃ¥lene litt mer tekst fra Embrik.

  • August (6)
    • +<<<<<<< Skolelinux_intervju__Embrik_Kaslegard.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.46 @@ -261,7 +265,11 @@ spørsmÃ¥lene litt mer tekst fra Embrik.

  • multimedia (13)
    • +<<<<<<< Skolelinux_intervju__Embrik_Kaslegard.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.46
  • nuug (119)
    • @@ -291,8 +299,13 @@ spørsmÃ¥lene litt mer tekst fra Embrik.

  • surveillance (9)
    • +<<<<<<< Skolelinux_intervju__Embrik_Kaslegard.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.46
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Skolelinux_intervju__Frode_Jemtland.html b/blog/Skolelinux_intervju__Frode_Jemtland.html index 4b7ab4ae64..45a10b51bd 100644 --- a/blog/Skolelinux_intervju__Frode_Jemtland.html +++ b/blog/Skolelinux_intervju__Frode_Jemtland.html @@ -171,7 +171,11 @@ sidelinjen.

  • August (6)
    • +<<<<<<< Skolelinux_intervju__Frode_Jemtland.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.12 @@ -285,7 +289,11 @@ sidelinjen.

  • multimedia (13)
    • +<<<<<<< Skolelinux_intervju__Frode_Jemtland.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.12
  • nuug (119)
    • @@ -315,8 +323,13 @@ sidelinjen.

  • surveillance (9)
    • +<<<<<<< Skolelinux_intervju__Frode_Jemtland.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.12
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Skolelinux_intervju__Marius_Kotsbak.html b/blog/Skolelinux_intervju__Marius_Kotsbak.html index e2d5d85c5c..c137b41e8a 100644 --- a/blog/Skolelinux_intervju__Marius_Kotsbak.html +++ b/blog/Skolelinux_intervju__Marius_Kotsbak.html @@ -118,7 +118,11 @@ av.

  • August (6)
    • +<<<<<<< Skolelinux_intervju__Marius_Kotsbak.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.26 @@ -232,7 +236,11 @@ av.

  • multimedia (13)
    • +<<<<<<< Skolelinux_intervju__Marius_Kotsbak.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.26
  • nuug (119)
    • @@ -262,8 +270,13 @@ av.

  • surveillance (9)
    • +<<<<<<< Skolelinux_intervju__Marius_Kotsbak.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.26
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Skolelinux_intervju__Morten_Amundsen.html b/blog/Skolelinux_intervju__Morten_Amundsen.html index a0e67b3124..4dd0d8b82e 100644 --- a/blog/Skolelinux_intervju__Morten_Amundsen.html +++ b/blog/Skolelinux_intervju__Morten_Amundsen.html @@ -116,7 +116,11 @@ fÃ¥ mest mulig læring for pengene man har.

  • August (6)
    • +<<<<<<< Skolelinux_intervju__Morten_Amundsen.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.41 @@ -230,7 +234,11 @@ fÃ¥ mest mulig læring for pengene man har.

  • multimedia (13)
    • +<<<<<<< Skolelinux_intervju__Morten_Amundsen.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.41
  • nuug (119)
    • @@ -260,8 +268,13 @@ fÃ¥ mest mulig læring for pengene man har.

  • surveillance (9)
    • +<<<<<<< Skolelinux_intervju__Morten_Amundsen.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.41
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Skolelinux_intervju__Odin_Hetland_N_sen.html b/blog/Skolelinux_intervju__Odin_Hetland_N_sen.html index 7740296fc1..975cff340a 100644 --- a/blog/Skolelinux_intervju__Odin_Hetland_N_sen.html +++ b/blog/Skolelinux_intervju__Odin_Hetland_N_sen.html @@ -194,7 +194,11 @@ det. Problemet er Ã¥ fÃ¥ dem som har makt til Ã¥ bestemme det til faktisk
  • August (6)
    • +<<<<<<< Skolelinux_intervju__Odin_Hetland_N_sen.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.2 @@ -308,7 +312,11 @@ det. Problemet er Ã¥ fÃ¥ dem som har makt til Ã¥ bestemme det til faktisk
  • multimedia (13)
    • +<<<<<<< Skolelinux_intervju__Odin_Hetland_N_sen.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.2
  • nuug (119)
    • @@ -338,8 +346,13 @@ det. Problemet er Ã¥ fÃ¥ dem som har makt til Ã¥ bestemme det til faktisk
  • surveillance (9)
    • +<<<<<<< Skolelinux_intervju__Odin_Hetland_N_sen.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.2
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Skolelinux_intervju__Rub_n_Romero_y_Cordero.html b/blog/Skolelinux_intervju__Rub_n_Romero_y_Cordero.html index 5b11244fa7..a6146241f6 100644 --- a/blog/Skolelinux_intervju__Rub_n_Romero_y_Cordero.html +++ b/blog/Skolelinux_intervju__Rub_n_Romero_y_Cordero.html @@ -140,7 +140,11 @@ opplysning, kunnskap og kompetanse.

  • August (6)
    • +<<<<<<< Skolelinux_intervju__Rub_n_Romero_y_Cordero.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.2 @@ -254,7 +258,11 @@ opplysning, kunnskap og kompetanse.

  • multimedia (13)
    • +<<<<<<< Skolelinux_intervju__Rub_n_Romero_y_Cordero.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.2
  • nuug (119)
    • @@ -284,8 +292,13 @@ opplysning, kunnskap og kompetanse.

  • surveillance (9)
    • +<<<<<<< Skolelinux_intervju__Rub_n_Romero_y_Cordero.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.2
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Skolelinux_intervju__Sturle_Sunde.html b/blog/Skolelinux_intervju__Sturle_Sunde.html index 87113e8020..d1f0f5c648 100644 --- a/blog/Skolelinux_intervju__Sturle_Sunde.html +++ b/blog/Skolelinux_intervju__Sturle_Sunde.html @@ -180,7 +180,11 @@ Det er eit godt produkt, brukt av mange og godt likt.»

  • August (6)
    • +<<<<<<< Skolelinux_intervju__Sturle_Sunde.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.44 @@ -294,7 +298,11 @@ Det er eit godt produkt, brukt av mange og godt likt.»

  • multimedia (13)
    • +<<<<<<< Skolelinux_intervju__Sturle_Sunde.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.44
  • nuug (119)
    • @@ -324,8 +332,13 @@ Det er eit godt produkt, brukt av mange og godt likt.»

  • surveillance (9)
    • +<<<<<<< Skolelinux_intervju__Sturle_Sunde.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.44
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Skolelinux_intervju__Viggo_Fedreheim.html b/blog/Skolelinux_intervju__Viggo_Fedreheim.html index 307279ee5d..dbcecd6a19 100644 --- a/blog/Skolelinux_intervju__Viggo_Fedreheim.html +++ b/blog/Skolelinux_intervju__Viggo_Fedreheim.html @@ -119,7 +119,11 @@ servere.

  • August (6)
    • +<<<<<<< Skolelinux_intervju__Viggo_Fedreheim.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.50 @@ -233,7 +237,11 @@ servere.

  • multimedia (13)
    • +<<<<<<< Skolelinux_intervju__Viggo_Fedreheim.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.50
  • nuug (119)
    • @@ -263,8 +271,13 @@ servere.

  • surveillance (9)
    • +<<<<<<< Skolelinux_intervju__Viggo_Fedreheim.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.50
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Software_updates_2010_10_24.html b/blog/Software_updates_2010_10_24.html index b3755566fe..0801060804 100644 --- a/blog/Software_updates_2010_10_24.html +++ b/blog/Software_updates_2010_10_24.html @@ -86,7 +86,11 @@ clients to get a Linux desktop on request.

  • August (6)
    • +<<<<<<< Software_updates_2010_10_24.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.88 @@ -200,7 +204,11 @@ clients to get a Linux desktop on request.

  • multimedia (13)
    • +<<<<<<< Software_updates_2010_10_24.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.88
  • nuug (119)
    • @@ -230,8 +238,13 @@ clients to get a Linux desktop on request.

  • surveillance (9)
    • +<<<<<<< Software_updates_2010_10_24.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.88
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Software_video_mixer_on_a_USB_stick.html b/blog/Software_video_mixer_on_a_USB_stick.html index 53a2115cf2..6e9cbc4f47 100644 --- a/blog/Software_video_mixer_on_a_USB_stick.html +++ b/blog/Software_video_mixer_on_a_USB_stick.html @@ -80,7 +80,11 @@ larger stick as well.

  • August (6)
    • +<<<<<<< Software_video_mixer_on_a_USB_stick.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.243 @@ -194,7 +198,11 @@ larger stick as well.

  • multimedia (13)
    • +<<<<<<< Software_video_mixer_on_a_USB_stick.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.243
  • nuug (119)
    • @@ -224,8 +232,13 @@ larger stick as well.

  • surveillance (9)
    • +<<<<<<< Software_video_mixer_on_a_USB_stick.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.243
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Some_notes_on_Flash_in_Debian_and_Debian_Edu.html b/blog/Some_notes_on_Flash_in_Debian_and_Debian_Edu.html index 8b60042cfa..50fcc176cb 100644 --- a/blog/Some_notes_on_Flash_in_Debian_and_Debian_Edu.html +++ b/blog/Some_notes_on_Flash_in_Debian_and_Debian_Edu.html @@ -96,7 +96,11 @@ accept the new package into Squeeze.

  • August (6)
    • +<<<<<<< Some_notes_on_Flash_in_Debian_and_Debian_Edu.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.104 @@ -210,7 +214,11 @@ accept the new package into Squeeze.

  • multimedia (13)
    • +<<<<<<< Some_notes_on_Flash_in_Debian_and_Debian_Edu.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.104
  • nuug (119)
    • @@ -240,8 +248,13 @@ accept the new package into Squeeze.

  • surveillance (9)
    • +<<<<<<< Some_notes_on_Flash_in_Debian_and_Debian_Edu.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.104
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Some_thoughts_on_BitCoins.html b/blog/Some_thoughts_on_BitCoins.html index c77420d97c..2786467b63 100644 --- a/blog/Some_thoughts_on_BitCoins.html +++ b/blog/Some_thoughts_on_BitCoins.html @@ -132,7 +132,11 @@ equally valid for gold, which was used as a currency for many years.

  • August (6)
    • +<<<<<<< Some_thoughts_on_BitCoins.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.71 @@ -246,7 +250,11 @@ equally valid for gold, which was used as a currency for many years.

  • multimedia (13)
    • +<<<<<<< Some_thoughts_on_BitCoins.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.71
  • nuug (119)
    • @@ -276,8 +284,13 @@ equally valid for gold, which was used as a currency for many years.

  • surveillance (9)
    • +<<<<<<< Some_thoughts_on_BitCoins.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.71
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/St_tte_for_forskjellige_kamera_ikoner_p__overv_kningskamerakartet.html b/blog/St_tte_for_forskjellige_kamera_ikoner_p__overv_kningskamerakartet.html index 62f3b1bdbe..00079f6292 100644 --- a/blog/St_tte_for_forskjellige_kamera_ikoner_p__overv_kningskamerakartet.html +++ b/blog/St_tte_for_forskjellige_kamera_ikoner_p__overv_kningskamerakartet.html @@ -68,7 +68,11 @@ langt.

  • August (6)
    • +<<<<<<< St_tte_for_forskjellige_kamera_ikoner_p__overv_kningskamerakartet.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.2 @@ -182,7 +186,11 @@ langt.

  • multimedia (13)
    • +<<<<<<< St_tte_for_forskjellige_kamera_ikoner_p__overv_kningskamerakartet.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.2
  • nuug (119)
    • @@ -212,8 +220,13 @@ langt.

  • surveillance (9)
    • +<<<<<<< St_tte_for_forskjellige_kamera_ikoner_p__overv_kningskamerakartet.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.2
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Standarder_fungerer_best_n_r_en_samler_seg_rundt_dem.html b/blog/Standarder_fungerer_best_n_r_en_samler_seg_rundt_dem.html index 37eb254d92..3bd63bd91c 100644 --- a/blog/Standarder_fungerer_best_n_r_en_samler_seg_rundt_dem.html +++ b/blog/Standarder_fungerer_best_n_r_en_samler_seg_rundt_dem.html @@ -69,7 +69,11 @@ bidrar positivt.

  • August (6)
    • +<<<<<<< Standarder_fungerer_best_n_r_en_samler_seg_rundt_dem.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.2 @@ -183,7 +187,11 @@ bidrar positivt.

  • multimedia (13)
    • +<<<<<<< Standarder_fungerer_best_n_r_en_samler_seg_rundt_dem.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.2
  • nuug (119)
    • @@ -213,8 +221,13 @@ bidrar positivt.

  • surveillance (9)
    • +<<<<<<< Standarder_fungerer_best_n_r_en_samler_seg_rundt_dem.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.2
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Standardize_on_protocols_and_formats__not_vendors_and_applications.html b/blog/Standardize_on_protocols_and_formats__not_vendors_and_applications.html index bc837644c1..c9abe84c44 100644 --- a/blog/Standardize_on_protocols_and_formats__not_vendors_and_applications.html +++ b/blog/Standardize_on_protocols_and_formats__not_vendors_and_applications.html @@ -81,7 +81,11 @@ application that do not use open network protocol or open formats.

  • August (6)
    • +<<<<<<< Standardize_on_protocols_and_formats__not_vendors_and_applications.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.214 @@ -195,7 +199,11 @@ application that do not use open network protocol or open formats.

  • multimedia (13)
    • +<<<<<<< Standardize_on_protocols_and_formats__not_vendors_and_applications.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.214
  • nuug (119)
    • @@ -225,8 +233,13 @@ application that do not use open network protocol or open formats.

  • surveillance (9)
    • +<<<<<<< Standardize_on_protocols_and_formats__not_vendors_and_applications.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.214
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Standardkrav_inn_i_anbudstekster_.html b/blog/Standardkrav_inn_i_anbudstekster_.html index b70e52fec2..a3dfa43e31 100644 --- a/blog/Standardkrav_inn_i_anbudstekster_.html +++ b/blog/Standardkrav_inn_i_anbudstekster_.html @@ -124,7 +124,11 @@ skal spesifisere hvordan seriell-konsoll skal fungere.

  • August (6)
    • +<<<<<<< Standardkrav_inn_i_anbudstekster_.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.90 @@ -238,7 +242,11 @@ skal spesifisere hvordan seriell-konsoll skal fungere.

  • multimedia (13)
    • +<<<<<<< Standardkrav_inn_i_anbudstekster_.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.90
  • nuug (119)
    • @@ -268,8 +276,13 @@ skal spesifisere hvordan seriell-konsoll skal fungere.

  • surveillance (9)
    • +<<<<<<< Standardkrav_inn_i_anbudstekster_.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.90
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Student_group_continue_the_work_on_my_Reprap_3D_printer.html b/blog/Student_group_continue_the_work_on_my_Reprap_3D_printer.html index d7da4e6ba9..389f7a4b87 100644 --- a/blog/Student_group_continue_the_work_on_my_Reprap_3D_printer.html +++ b/blog/Student_group_continue_the_work_on_my_Reprap_3D_printer.html @@ -75,7 +75,11 @@ very cool 3D scanner.

  • August (6)
    • +<<<<<<< Student_group_continue_the_work_on_my_Reprap_3D_printer.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.71 @@ -189,7 +193,11 @@ very cool 3D scanner.

  • multimedia (13)
    • +<<<<<<< Student_group_continue_the_work_on_my_Reprap_3D_printer.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.71
  • nuug (119)
    • @@ -219,8 +227,13 @@ very cool 3D scanner.

  • surveillance (9)
    • +<<<<<<< Student_group_continue_the_work_on_my_Reprap_3D_printer.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.71
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/TED_talks_p__norsk_og_NUUG_foredrag___frivillige_trengs_til_teksting.html b/blog/TED_talks_p__norsk_og_NUUG_foredrag___frivillige_trengs_til_teksting.html index 5a78f93cb7..56ab94bc17 100644 --- a/blog/TED_talks_p__norsk_og_NUUG_foredrag___frivillige_trengs_til_teksting.html +++ b/blog/TED_talks_p__norsk_og_NUUG_foredrag___frivillige_trengs_til_teksting.html @@ -83,7 +83,11 @@ lar en bidra med teksting via en nettleser.

  • August (6)
    • +<<<<<<< TED_talks_p__norsk_og_NUUG_foredrag___frivillige_trengs_til_teksting.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.2 @@ -197,7 +201,11 @@ lar en bidra med teksting via en nettleser.

  • multimedia (13)
    • +<<<<<<< TED_talks_p__norsk_og_NUUG_foredrag___frivillige_trengs_til_teksting.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.2
  • nuug (119)
    • @@ -227,8 +235,13 @@ lar en bidra med teksting via en nettleser.

  • surveillance (9)
    • +<<<<<<< TED_talks_p__norsk_og_NUUG_foredrag___frivillige_trengs_til_teksting.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.2
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Taking_over_sysvinit_development.html b/blog/Taking_over_sysvinit_development.html index a13bd35533..a0e2cc8693 100644 --- a/blog/Taking_over_sysvinit_development.html +++ b/blog/Taking_over_sysvinit_development.html @@ -78,7 +78,11 @@ distributions are moving to upstart as a syvinit replacement.

  • August (6)
    • +<<<<<<< Taking_over_sysvinit_development.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.187 @@ -192,7 +196,11 @@ distributions are moving to upstart as a syvinit replacement.

  • multimedia (13)
    • +<<<<<<< Taking_over_sysvinit_development.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.187
  • nuug (119)
    • @@ -222,8 +230,13 @@ distributions are moving to upstart as a syvinit replacement.

  • surveillance (9)
    • +<<<<<<< Taking_over_sysvinit_development.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.187
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Teknisk_program_for_Go_Open_2009_er_nesten_ferdig.html b/blog/Teknisk_program_for_Go_Open_2009_er_nesten_ferdig.html index e57748901f..ebe474b01e 100644 --- a/blog/Teknisk_program_for_Go_Open_2009_er_nesten_ferdig.html +++ b/blog/Teknisk_program_for_Go_Open_2009_er_nesten_ferdig.html @@ -84,7 +84,11 @@ stort.

  • August (6)
    • +<<<<<<< Teknisk_program_for_Go_Open_2009_er_nesten_ferdig.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.225 @@ -198,7 +202,11 @@ stort.

  • multimedia (13)
    • +<<<<<<< Teknisk_program_for_Go_Open_2009_er_nesten_ferdig.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.225
  • nuug (119)
    • @@ -228,8 +236,13 @@ stort.

  • surveillance (9)
    • +<<<<<<< Teknisk_program_for_Go_Open_2009_er_nesten_ferdig.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.225
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Terms_of_use_for_video_produced_by_a_Canon_IXUS_130_digital_camera.html b/blog/Terms_of_use_for_video_produced_by_a_Canon_IXUS_130_digital_camera.html index 6286573fe0..2da0251c33 100644 --- a/blog/Terms_of_use_for_video_produced_by_a_Canon_IXUS_130_digital_camera.html +++ b/blog/Terms_of_use_for_video_produced_by_a_Canon_IXUS_130_digital_camera.html @@ -96,7 +96,11 @@ Theora, and avoid MPEG-4 and H.264 if you can.

  • August (6)
    • +<<<<<<< Terms_of_use_for_video_produced_by_a_Canon_IXUS_130_digital_camera.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.102 @@ -210,7 +214,11 @@ Theora, and avoid MPEG-4 and H.264 if you can.

  • multimedia (13)
    • +<<<<<<< Terms_of_use_for_video_produced_by_a_Canon_IXUS_130_digital_camera.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.102
  • nuug (119)
    • @@ -240,8 +248,13 @@ Theora, and avoid MPEG-4 and H.264 if you can.

  • surveillance (9)
    • +<<<<<<< Terms_of_use_for_video_produced_by_a_Canon_IXUS_130_digital_camera.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.102
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Tester_blog.html b/blog/Tester_blog.html index cf719022b0..ec44f1dc2e 100644 --- a/blog/Tester_blog.html +++ b/blog/Tester_blog.html @@ -59,7 +59,11 @@ forsøk.

  • August (6)
    • +<<<<<<< Tester_blog.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.257 @@ -173,7 +177,11 @@ forsøk.

  • multimedia (13)
    • +<<<<<<< Tester_blog.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.257
  • nuug (119)
    • @@ -203,8 +211,13 @@ forsøk.

  • surveillance (9)
    • +<<<<<<< Tester_blog.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.257
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Testing_av_reprap_elektronikken_igang.html b/blog/Testing_av_reprap_elektronikken_igang.html index 6c78d75f13..88cf5d8559 100644 --- a/blog/Testing_av_reprap_elektronikken_igang.html +++ b/blog/Testing_av_reprap_elektronikken_igang.html @@ -87,7 +87,11 @@ reprap-en kvikner til.

  • August (6)
    • +<<<<<<< Testing_av_reprap_elektronikken_igang.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.221 @@ -201,7 +205,11 @@ reprap-en kvikner til.

  • multimedia (13)
    • +<<<<<<< Testing_av_reprap_elektronikken_igang.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.221
  • nuug (119)
    • @@ -231,8 +239,13 @@ reprap-en kvikner til.

  • surveillance (9)
    • +<<<<<<< Testing_av_reprap_elektronikken_igang.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.221
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Testing_if_a_file_system_can_be_used_for_home_directories___.html b/blog/Testing_if_a_file_system_can_be_used_for_home_directories___.html index 737b46ef3c..ff19901413 100644 --- a/blog/Testing_if_a_file_system_can_be_used_for_home_directories___.html +++ b/blog/Testing_if_a_file_system_can_be_used_for_home_directories___.html @@ -279,7 +279,11 @@ script so useful that he created a GIT repository and stored it in
  • August (6)
    • +<<<<<<< Testing_if_a_file_system_can_be_used_for_home_directories___.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.117 @@ -393,7 +397,11 @@ script so useful that he created a GIT repository and stored it in
  • multimedia (13)
    • +<<<<<<< Testing_if_a_file_system_can_be_used_for_home_directories___.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.117
  • nuug (119)
    • @@ -423,8 +431,13 @@ script so useful that he created a GIT repository and stored it in
  • surveillance (9)
    • +<<<<<<< Testing_if_a_file_system_can_be_used_for_home_directories___.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.117
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/The_many_definitions_of_a_open_standard.html b/blog/The_many_definitions_of_a_open_standard.html index b64d8cd97d..accef6cc5b 100644 --- a/blog/The_many_definitions_of_a_open_standard.html +++ b/blog/The_many_definitions_of_a_open_standard.html @@ -274,7 +274,11 @@ Standards.

  • August (6)
    • +<<<<<<< The_many_definitions_of_a_open_standard.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.62 @@ -388,7 +392,11 @@ Standards.

  • multimedia (13)
    • +<<<<<<< The_many_definitions_of_a_open_standard.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.62
  • nuug (119)
    • @@ -418,8 +426,13 @@ Standards.

  • surveillance (9)
    • +<<<<<<< The_many_definitions_of_a_open_standard.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.62
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/The_reply_from_Edgar_Villanueva_to_Microsoft_in_Peru.html b/blog/The_reply_from_Edgar_Villanueva_to_Microsoft_in_Peru.html index 441a13b5c1..ac2531e679 100644 --- a/blog/The_reply_from_Edgar_Villanueva_to_Microsoft_in_Peru.html +++ b/blog/The_reply_from_Edgar_Villanueva_to_Microsoft_in_Peru.html @@ -252,7 +252,11 @@ Congressman of the Republic of Perú.

  • August (6)
    • +<<<<<<< The_reply_from_Edgar_Villanueva_to_Microsoft_in_Peru.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.63 @@ -366,7 +370,11 @@ Congressman of the Republic of Perú.

  • multimedia (13)
    • +<<<<<<< The_reply_from_Edgar_Villanueva_to_Microsoft_in_Peru.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.63
  • nuug (119)
    • @@ -396,8 +404,13 @@ Congressman of the Republic of Perú.

  • surveillance (9)
    • +<<<<<<< The_reply_from_Edgar_Villanueva_to_Microsoft_in_Peru.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.63
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/The_sorry_state_of_multimedia_browser_plugins_in_Debian.html b/blog/The_sorry_state_of_multimedia_browser_plugins_in_Debian.html index 44b01334e1..1218f663f1 100644 --- a/blog/The_sorry_state_of_multimedia_browser_plugins_in_Debian.html +++ b/blog/The_sorry_state_of_multimedia_browser_plugins_in_Debian.html @@ -74,7 +74,11 @@ be the only one fitting our needs. :/

  • August (6)
    • +<<<<<<< The_sorry_state_of_multimedia_browser_plugins_in_Debian.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.256 @@ -188,7 +192,11 @@ be the only one fitting our needs. :/

  • multimedia (13)
    • +<<<<<<< The_sorry_state_of_multimedia_browser_plugins_in_Debian.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.256
  • nuug (119)
    • @@ -218,8 +226,13 @@ be the only one fitting our needs. :/

  • surveillance (9)
    • +<<<<<<< The_sorry_state_of_multimedia_browser_plugins_in_Debian.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.256
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/The_video_format_most_supported_in_web_browsers_.html b/blog/The_video_format_most_supported_in_web_browsers_.html index cf34b9560e..ac45e0e133 100644 --- a/blog/The_video_format_most_supported_in_web_browsers_.html +++ b/blog/The_video_format_most_supported_in_web_browsers_.html @@ -104,7 +104,11 @@ provided by external plugins like the Flash plugins.

  • August (6)
    • +<<<<<<< The_video_format_most_supported_in_web_browsers_.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.48 @@ -218,7 +222,11 @@ provided by external plugins like the Flash plugins.

  • multimedia (13)
    • +<<<<<<< The_video_format_most_supported_in_web_browsers_.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.48
  • nuug (119)
    • @@ -248,8 +256,13 @@ provided by external plugins like the Flash plugins.

  • surveillance (9)
    • +<<<<<<< The_video_format_most_supported_in_web_browsers_.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.48
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Thoughts_on_roaming_laptop_setup_for_Debian_Edu.html b/blog/Thoughts_on_roaming_laptop_setup_for_Debian_Edu.html index d19ff0b30b..fadaa740f3 100644 --- a/blog/Thoughts_on_roaming_laptop_setup_for_Debian_Edu.html +++ b/blog/Thoughts_on_roaming_laptop_setup_for_Debian_Edu.html @@ -121,7 +121,11 @@ please contact us on debian-edu@lists.debian.org.

  • August (6)
    • +<<<<<<< Thoughts_on_roaming_laptop_setup_for_Debian_Edu.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.164 @@ -235,7 +239,11 @@ please contact us on debian-edu@lists.debian.org.

  • multimedia (13)
    • +<<<<<<< Thoughts_on_roaming_laptop_setup_for_Debian_Edu.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.164
  • nuug (119)
    • @@ -265,8 +273,13 @@ please contact us on debian-edu@lists.debian.org.

  • surveillance (9)
    • +<<<<<<< Thoughts_on_roaming_laptop_setup_for_Debian_Edu.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.164
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Time_for_new__LDAP_schemas_replacing_RFC_2307_.html b/blog/Time_for_new__LDAP_schemas_replacing_RFC_2307_.html index 2b99c8fe3b..623be45a31 100644 --- a/blog/Time_for_new__LDAP_schemas_replacing_RFC_2307_.html +++ b/blog/Time_for_new__LDAP_schemas_replacing_RFC_2307_.html @@ -88,7 +88,11 @@ new IETF work group?

  • August (6)
    • +<<<<<<< Time_for_new__LDAP_schemas_replacing_RFC_2307_.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.215 @@ -202,7 +206,11 @@ new IETF work group?

  • multimedia (13)
    • +<<<<<<< Time_for_new__LDAP_schemas_replacing_RFC_2307_.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.215
  • nuug (119)
    • @@ -232,8 +240,13 @@ new IETF work group?

  • surveillance (9)
    • +<<<<<<< Time_for_new__LDAP_schemas_replacing_RFC_2307_.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.215
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Togsatsing_p__norsk__mot_sykkel.html b/blog/Togsatsing_p__norsk__mot_sykkel.html index 0316232788..dc8f0fd0df 100644 --- a/blog/Togsatsing_p__norsk__mot_sykkel.html +++ b/blog/Togsatsing_p__norsk__mot_sykkel.html @@ -63,7 +63,11 @@ effekt pÃ¥ omrÃ¥det der?

  • August (6)
    • +<<<<<<< Togsatsing_p__norsk__mot_sykkel.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.2 @@ -177,7 +181,11 @@ effekt pÃ¥ omrÃ¥det der?

  • multimedia (13)
    • +<<<<<<< Togsatsing_p__norsk__mot_sykkel.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.2
  • nuug (119)
    • @@ -207,8 +215,13 @@ effekt pÃ¥ omrÃ¥det der?

  • surveillance (9)
    • +<<<<<<< Togsatsing_p__norsk__mot_sykkel.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.2
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Transendentalt_tullball_og_en_funksjonell_tiln_rming.html b/blog/Transendentalt_tullball_og_en_funksjonell_tiln_rming.html index 13532d21f0..489982389c 100644 --- a/blog/Transendentalt_tullball_og_en_funksjonell_tiln_rming.html +++ b/blog/Transendentalt_tullball_og_en_funksjonell_tiln_rming.html @@ -75,7 +75,11 @@ oppløsning.

  • August (6)
    • +<<<<<<< Transendentalt_tullball_og_en_funksjonell_tiln_rming.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.2 @@ -189,7 +193,11 @@ oppløsning.

  • multimedia (13)
    • +<<<<<<< Transendentalt_tullball_og_en_funksjonell_tiln_rming.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.2
  • nuug (119)
    • @@ -219,8 +227,13 @@ oppløsning.

  • surveillance (9)
    • +<<<<<<< Transendentalt_tullball_og_en_funksjonell_tiln_rming.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.2
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Two_projects_that_have_improved_the_quality_of_free_software_a_lot.html b/blog/Two_projects_that_have_improved_the_quality_of_free_software_a_lot.html index 6caab5d464..eedc8cd8bc 100644 --- a/blog/Two_projects_that_have_improved_the_quality_of_free_software_a_lot.html +++ b/blog/Two_projects_that_have_improved_the_quality_of_free_software_a_lot.html @@ -92,7 +92,11 @@ surrounded by today.

  • August (6)
    • +<<<<<<< Two_projects_that_have_improved_the_quality_of_free_software_a_lot.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.202 @@ -206,7 +210,11 @@ surrounded by today.

  • multimedia (13)
    • +<<<<<<< Two_projects_that_have_improved_the_quality_of_free_software_a_lot.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.202
  • nuug (119)
    • @@ -236,8 +244,13 @@ surrounded by today.

  • surveillance (9)
    • +<<<<<<< Two_projects_that_have_improved_the_quality_of_free_software_a_lot.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.202
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Upstart_or_sysvinit___as_init_d_scripts_see_it.html b/blog/Upstart_or_sysvinit___as_init_d_scripts_see_it.html index e09cecc5c7..abe206494d 100644 --- a/blog/Upstart_or_sysvinit___as_init_d_scripts_see_it.html +++ b/blog/Upstart_or_sysvinit___as_init_d_scripts_see_it.html @@ -97,7 +97,11 @@ choice.

  • August (6)
    • +<<<<<<< Upstart_or_sysvinit___as_init_d_scripts_see_it.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.146 @@ -211,7 +215,11 @@ choice.

  • multimedia (13)
    • +<<<<<<< Upstart_or_sysvinit___as_init_d_scripts_see_it.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.146
  • nuug (119)
    • @@ -241,8 +249,13 @@ choice.

  • surveillance (9)
    • +<<<<<<< Upstart_or_sysvinit___as_init_d_scripts_see_it.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.146
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Using_NVD_and_CPE_to_track_CVEs_in_locally_maintained_software.html b/blog/Using_NVD_and_CPE_to_track_CVEs_in_locally_maintained_software.html index b95236fc16..0086809026 100644 --- a/blog/Using_NVD_and_CPE_to_track_CVEs_in_locally_maintained_software.html +++ b/blog/Using_NVD_and_CPE_to_track_CVEs_in_locally_maintained_software.html @@ -126,7 +126,11 @@ for their packages.

  • August (6)
    • +<<<<<<< Using_NVD_and_CPE_to_track_CVEs_in_locally_maintained_software.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.41 @@ -240,7 +244,11 @@ for their packages.

  • multimedia (13)
    • +<<<<<<< Using_NVD_and_CPE_to_track_CVEs_in_locally_maintained_software.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.41
  • nuug (119)
    • @@ -270,8 +278,13 @@ for their packages.

  • surveillance (9)
    • +<<<<<<< Using_NVD_and_CPE_to_track_CVEs_in_locally_maintained_software.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.41
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Using_bar_codes_at_a_computing_center.html b/blog/Using_bar_codes_at_a_computing_center.html index 899ef35c79..ae509eb2d9 100644 --- a/blog/Using_bar_codes_at_a_computing_center.html +++ b/blog/Using_bar_codes_at_a_computing_center.html @@ -97,7 +97,11 @@ easier automatic tracking of computers.

  • August (6)
    • +<<<<<<< Using_bar_codes_at_a_computing_center.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.227 @@ -211,7 +215,11 @@ easier automatic tracking of computers.

  • multimedia (13)
    • +<<<<<<< Using_bar_codes_at_a_computing_center.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.227
  • nuug (119)
    • @@ -241,8 +249,13 @@ easier automatic tracking of computers.

  • surveillance (9)
    • +<<<<<<< Using_bar_codes_at_a_computing_center.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.227
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Vinmonopolet_bryter_loven__penlyst___og_flere_planlegger___gj_re_det_samme.html b/blog/Vinmonopolet_bryter_loven__penlyst___og_flere_planlegger___gj_re_det_samme.html index 7e8d54ffaa..391b379988 100644 --- a/blog/Vinmonopolet_bryter_loven__penlyst___og_flere_planlegger___gj_re_det_samme.html +++ b/blog/Vinmonopolet_bryter_loven__penlyst___og_flere_planlegger___gj_re_det_samme.html @@ -90,7 +90,11 @@ hÃ¥ndheves strengt.

  • August (6)
    • +<<<<<<< Vinmonopolet_bryter_loven__penlyst___og_flere_planlegger___gj_re_det_samme.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.2 @@ -204,7 +208,11 @@ hÃ¥ndheves strengt.

  • multimedia (13)
    • +<<<<<<< Vinmonopolet_bryter_loven__penlyst___og_flere_planlegger___gj_re_det_samme.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.2
  • nuug (119)
    • @@ -234,8 +242,13 @@ hÃ¥ndheves strengt.

  • surveillance (9)
    • +<<<<<<< Vinmonopolet_bryter_loven__penlyst___og_flere_planlegger___gj_re_det_samme.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.2
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Vitenskapens_dogmer___.html b/blog/Vitenskapens_dogmer___.html index 5e47d468d6..988fb9364e 100644 --- a/blog/Vitenskapens_dogmer___.html +++ b/blog/Vitenskapens_dogmer___.html @@ -124,7 +124,11 @@ skyskrapere. Takke meg til en tur til mÃ¥nen.

  • August (6)
    • +<<<<<<< Vitenskapens_dogmer___.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.217 @@ -238,7 +242,11 @@ skyskrapere. Takke meg til en tur til mÃ¥nen.

  • multimedia (13)
    • +<<<<<<< Vitenskapens_dogmer___.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.217
  • nuug (119)
    • @@ -268,8 +276,13 @@ skyskrapere. Takke meg til en tur til mÃ¥nen.

  • surveillance (9)
    • +<<<<<<< Vitenskapens_dogmer___.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.217
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Voteringsdata_fra_stortinget_p__plass__mye_igjen.html b/blog/Voteringsdata_fra_stortinget_p__plass__mye_igjen.html index 0354e2728c..f1af0296aa 100644 --- a/blog/Voteringsdata_fra_stortinget_p__plass__mye_igjen.html +++ b/blog/Voteringsdata_fra_stortinget_p__plass__mye_igjen.html @@ -90,7 +90,11 @@ utviklingstimer for Ã¥ en norsk portal pÃ¥ plass.

  • August (6)
    • +<<<<<<< Voteringsdata_fra_stortinget_p__plass__mye_igjen.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.2 @@ -204,7 +208,11 @@ utviklingstimer for Ã¥ en norsk portal pÃ¥ plass.

  • multimedia (13)
    • +<<<<<<< Voteringsdata_fra_stortinget_p__plass__mye_igjen.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.2
  • nuug (119)
    • @@ -234,8 +242,13 @@ utviklingstimer for Ã¥ en norsk portal pÃ¥ plass.

  • surveillance (9)
    • +<<<<<<< Voteringsdata_fra_stortinget_p__plass__mye_igjen.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.2
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Webbasert_tegneseriearkiv_p__trappene.html b/blog/Webbasert_tegneseriearkiv_p__trappene.html index d1a43e5034..8f7b23eef2 100644 --- a/blog/Webbasert_tegneseriearkiv_p__trappene.html +++ b/blog/Webbasert_tegneseriearkiv_p__trappene.html @@ -101,7 +101,11 @@ titt.

  • August (6)
    • +<<<<<<< Webbasert_tegneseriearkiv_p__trappene.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.2 @@ -215,7 +219,11 @@ titt.

  • multimedia (13)
    • +<<<<<<< Webbasert_tegneseriearkiv_p__trappene.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.2
  • nuug (119)
    • @@ -245,8 +253,13 @@ titt.

  • surveillance (9)
    • +<<<<<<< Webbasert_tegneseriearkiv_p__trappene.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.2
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/What_are_they_searching_for___PowerDNS_and_ISC_DHCP_in_LDAP.html b/blog/What_are_they_searching_for___PowerDNS_and_ISC_DHCP_in_LDAP.html index 233dc83541..47f7234661 100644 --- a/blog/What_are_they_searching_for___PowerDNS_and_ISC_DHCP_in_LDAP.html +++ b/blog/What_are_they_searching_for___PowerDNS_and_ISC_DHCP_in_LDAP.html @@ -367,7 +367,11 @@ auxiliary object class.

  • August (6)
    • +<<<<<<< What_are_they_searching_for___PowerDNS_and_ISC_DHCP_in_LDAP.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.125 @@ -481,7 +485,11 @@ auxiliary object class.

  • multimedia (13)
    • +<<<<<<< What_are_they_searching_for___PowerDNS_and_ISC_DHCP_in_LDAP.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.125
  • nuug (119)
    • @@ -511,8 +519,13 @@ auxiliary object class.

  • surveillance (9)
    • +<<<<<<< What_are_they_searching_for___PowerDNS_and_ISC_DHCP_in_LDAP.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.125
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/What_is_missing_in_the_Debian_desktop__or_why_my_parents_use_Kubuntu.html b/blog/What_is_missing_in_the_Debian_desktop__or_why_my_parents_use_Kubuntu.html index 6078b85cc5..da96989813 100644 --- a/blog/What_is_missing_in_the_Debian_desktop__or_why_my_parents_use_Kubuntu.html +++ b/blog/What_is_missing_in_the_Debian_desktop__or_why_my_parents_use_Kubuntu.html @@ -118,7 +118,11 @@ maintainers, but would make the end user experience a lot better.

  • August (6)
    • +<<<<<<< What_is_missing_in_the_Debian_desktop__or_why_my_parents_use_Kubuntu.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.10 @@ -232,7 +236,11 @@ maintainers, but would make the end user experience a lot better.

  • multimedia (13)
    • +<<<<<<< What_is_missing_in_the_Debian_desktop__or_why_my_parents_use_Kubuntu.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.10
  • nuug (119)
    • @@ -262,8 +270,13 @@ maintainers, but would make the end user experience a lot better.

  • surveillance (9)
    • +<<<<<<< What_is_missing_in_the_Debian_desktop__or_why_my_parents_use_Kubuntu.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.10
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/What_should_start_from__etc_rcS_d__in_Debian____almost_nothing.html b/blog/What_should_start_from__etc_rcS_d__in_Debian____almost_nothing.html index f62da048d4..8bd68d160e 100644 --- a/blog/What_should_start_from__etc_rcS_d__in_Debian____almost_nothing.html +++ b/blog/What_should_start_from__etc_rcS_d__in_Debian____almost_nothing.html @@ -99,7 +99,11 @@ find time to push this forward.

  • August (6)
    • +<<<<<<< What_should_start_from__etc_rcS_d__in_Debian____almost_nothing.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.10 @@ -213,7 +217,11 @@ find time to push this forward.

  • multimedia (13)
    • +<<<<<<< What_should_start_from__etc_rcS_d__in_Debian____almost_nothing.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.10
  • nuug (119)
    • @@ -243,8 +251,13 @@ find time to push this forward.

  • surveillance (9)
    • +<<<<<<< What_should_start_from__etc_rcS_d__in_Debian____almost_nothing.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.10
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/What_standards_are_Free_and_Open_as_defined_by_Digistan_.html b/blog/What_standards_are_Free_and_Open_as_defined_by_Digistan_.html index 1e4343303d..93fa19bae0 100644 --- a/blog/What_standards_are_Free_and_Open_as_defined_by_Digistan_.html +++ b/blog/What_standards_are_Free_and_Open_as_defined_by_Digistan_.html @@ -77,7 +77,11 @@ scared by the sketchy form of the current pages. :)

  • August (6)
    • +<<<<<<< What_standards_are_Free_and_Open_as_defined_by_Digistan_.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.60 @@ -191,7 +195,11 @@ scared by the sketchy form of the current pages. :)

  • multimedia (13)
    • +<<<<<<< What_standards_are_Free_and_Open_as_defined_by_Digistan_.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.60
  • nuug (119)
    • @@ -221,8 +229,13 @@ scared by the sketchy form of the current pages. :)

  • surveillance (9)
    • +<<<<<<< What_standards_are_Free_and_Open_as_defined_by_Digistan_.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.60
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/When_web_browser_developers_make_a_video_player___.html b/blog/When_web_browser_developers_make_a_video_player___.html index ca2890465f..1fa45e0d2d 100644 --- a/blog/When_web_browser_developers_make_a_video_player___.html +++ b/blog/When_web_browser_developers_make_a_video_player___.html @@ -98,7 +98,11 @@ sure hope it was using the announced Ogg Theora support. :)

  • August (6)
    • +<<<<<<< When_web_browser_developers_make_a_video_player___.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.239 @@ -212,7 +216,11 @@ sure hope it was using the announced Ogg Theora support. :)

  • multimedia (13)
    • +<<<<<<< When_web_browser_developers_make_a_video_player___.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.239
  • nuug (119)
    • @@ -242,8 +250,13 @@ sure hope it was using the announced Ogg Theora support. :)

  • surveillance (9)
    • +<<<<<<< When_web_browser_developers_make_a_video_player___.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.239
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Which_module_is_loaded_for_a_given_PCI_and_USB_device_.html b/blog/Which_module_is_loaded_for_a_given_PCI_and_USB_device_.html index 4d1ca22763..e993f1a28e 100644 --- a/blog/Which_module_is_loaded_for_a_given_PCI_and_USB_device_.html +++ b/blog/Which_module_is_loaded_for_a_given_PCI_and_USB_device_.html @@ -132,7 +132,11 @@ well.

  • August (6)
    • +<<<<<<< Which_module_is_loaded_for_a_given_PCI_and_USB_device_.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.43 @@ -246,7 +250,11 @@ well.

  • multimedia (13)
    • +<<<<<<< Which_module_is_loaded_for_a_given_PCI_and_USB_device_.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.43
  • nuug (119)
    • @@ -276,8 +284,13 @@ well.

  • surveillance (9)
    • +<<<<<<< Which_module_is_loaded_for_a_given_PCI_and_USB_device_.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.43
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Why_isn_t_Debian_Edu_using_VLC_.html b/blog/Why_isn_t_Debian_Edu_using_VLC_.html index 4baebe7fe4..e17910e1be 100644 --- a/blog/Why_isn_t_Debian_Edu_using_VLC_.html +++ b/blog/Why_isn_t_Debian_Edu_using_VLC_.html @@ -87,7 +87,11 @@ what is going on.

  • August (6)
    • +<<<<<<< Why_isn_t_Debian_Edu_using_VLC_.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.73 @@ -201,7 +205,11 @@ what is going on.

  • multimedia (13)
    • +<<<<<<< Why_isn_t_Debian_Edu_using_VLC_.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.73
  • nuug (119)
    • @@ -231,8 +239,13 @@ what is going on.

  • surveillance (9)
    • +<<<<<<< Why_isn_t_Debian_Edu_using_VLC_.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.73
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/_pne_tr_dl_snett_er_et_samfunnsgode.html b/blog/_pne_tr_dl_snett_er_et_samfunnsgode.html index 8d8b0a418d..4dd0e404d4 100644 --- a/blog/_pne_tr_dl_snett_er_et_samfunnsgode.html +++ b/blog/_pne_tr_dl_snett_er_et_samfunnsgode.html @@ -76,7 +76,11 @@ anstrenge oss for Ã¥ beholde.

  • August (6)
    • +<<<<<<< _pne_tr_dl_snett_er_et_samfunnsgode.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.2 @@ -190,7 +194,11 @@ anstrenge oss for Ã¥ beholde.

  • multimedia (13)
    • +<<<<<<< _pne_tr_dl_snett_er_et_samfunnsgode.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.2
  • nuug (119)
    • @@ -220,8 +228,13 @@ anstrenge oss for Ã¥ beholde.

  • surveillance (9)
    • +<<<<<<< _pne_tr_dl_snett_er_et_samfunnsgode.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.2
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/archive/2008/11/index.html b/blog/archive/2008/11/index.html index 0883178f28..382a21f3a6 100644 --- a/blog/archive/2008/11/index.html +++ b/blog/archive/2008/11/index.html @@ -208,7 +208,11 @@ lenge alt er klart til Go Open
  • August (6)
    • +<<<<<<< index.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.261 @@ -322,7 +326,11 @@ lenge alt er klart til Go Open
  • multimedia (13)
    • +<<<<<<< index.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.261
  • nuug (119)
    • @@ -352,8 +360,13 @@ lenge alt er klart til Go Open
  • surveillance (9)
    • +<<<<<<< index.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.261
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/archive/2008/12/index.html b/blog/archive/2008/12/index.html index d857afb2ba..01ab5595e5 100644 --- a/blog/archive/2008/12/index.html +++ b/blog/archive/2008/12/index.html @@ -368,7 +368,11 @@ larger stick as well.

  • August (6)
    • +<<<<<<< index.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.248 @@ -482,7 +486,11 @@ larger stick as well.

  • multimedia (13)
    • +<<<<<<< index.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.248
  • nuug (119)
    • @@ -512,8 +520,13 @@ larger stick as well.

  • surveillance (9)
    • +<<<<<<< index.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.248
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/archive/2009/01/index.html b/blog/archive/2009/01/index.html index a1b82df311..1e3e64a8e6 100644 --- a/blog/archive/2009/01/index.html +++ b/blog/archive/2009/01/index.html @@ -535,7 +535,11 @@ produkter basert pÃ¥ standarden.

  • August (6)
    • +<<<<<<< index.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.254 @@ -649,7 +653,11 @@ produkter basert pÃ¥ standarden.

  • multimedia (13)
    • +<<<<<<< index.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.254
  • nuug (119)
    • @@ -679,8 +687,13 @@ produkter basert pÃ¥ standarden.

  • surveillance (9)
    • +<<<<<<< index.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.254
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/archive/2009/02/index.html b/blog/archive/2009/02/index.html index 5872f081a6..8f05a8ca4c 100644 --- a/blog/archive/2009/02/index.html +++ b/blog/archive/2009/02/index.html @@ -513,7 +513,11 @@ do so.

  • August (6)
    • +<<<<<<< index.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.239 @@ -627,7 +631,11 @@ do so.

  • multimedia (13)
    • +<<<<<<< index.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.239
  • nuug (119)
    • @@ -657,8 +665,13 @@ do so.

  • surveillance (9)
    • +<<<<<<< index.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.239
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/archive/2009/03/index.html b/blog/archive/2009/03/index.html index d18b138cc4..71238c0f06 100644 --- a/blog/archive/2009/03/index.html +++ b/blog/archive/2009/03/index.html @@ -694,7 +694,11 @@ application that do not use open network protocol or open formats.

  • August (6)
    • +<<<<<<< index.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.226 @@ -808,7 +812,11 @@ application that do not use open network protocol or open formats.

  • multimedia (13)
    • +<<<<<<< index.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.226
  • nuug (119)
    • @@ -838,8 +846,13 @@ application that do not use open network protocol or open formats.

  • surveillance (9)
    • +<<<<<<< index.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.226
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/archive/2009/04/index.html b/blog/archive/2009/04/index.html index 25ece20cc3..ccad0e87a8 100644 --- a/blog/archive/2009/04/index.html +++ b/blog/archive/2009/04/index.html @@ -490,7 +490,11 @@ properties.

  • August (6)
    • +<<<<<<< index.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.215 @@ -604,7 +608,11 @@ properties.

  • multimedia (13)
    • +<<<<<<< index.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.215
  • nuug (119)
    • @@ -634,8 +642,13 @@ properties.

  • surveillance (9)
    • +<<<<<<< index.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.215
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/archive/2009/05/index.html b/blog/archive/2009/05/index.html index 265754d0a4..efb5acf794 100644 --- a/blog/archive/2009/05/index.html +++ b/blog/archive/2009/05/index.html @@ -449,7 +449,11 @@ bidrar positivt.

  • August (6)
    • +<<<<<<< index.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.205 @@ -563,7 +567,11 @@ bidrar positivt.

  • multimedia (13)
    • +<<<<<<< index.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.205
  • nuug (119)
    • @@ -593,8 +601,13 @@ bidrar positivt.

  • surveillance (9)
    • +<<<<<<< index.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.205
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/archive/2009/06/index.html b/blog/archive/2009/06/index.html index 36aa00a00c..61f098f94e 100644 --- a/blog/archive/2009/06/index.html +++ b/blog/archive/2009/06/index.html @@ -224,7 +224,11 @@ misvisende pÃ¥stander etter i sømmene.

  • August (6)
    • +<<<<<<< index.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.194 @@ -338,7 +342,11 @@ misvisende pÃ¥stander etter i sømmene.

  • multimedia (13)
    • +<<<<<<< index.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.194
  • nuug (119)
    • @@ -368,8 +376,13 @@ misvisende pÃ¥stander etter i sømmene.

  • surveillance (9)
    • +<<<<<<< index.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.194
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/archive/2009/07/index.html b/blog/archive/2009/07/index.html index d25376d6ce..8773d1b9fa 100644 --- a/blog/archive/2009/07/index.html +++ b/blog/archive/2009/07/index.html @@ -210,7 +210,11 @@ non-predictable kernel in the early boot.

  • August (6)
    • +<<<<<<< index.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.190 @@ -324,7 +328,11 @@ non-predictable kernel in the early boot.

  • multimedia (13)
    • +<<<<<<< index.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.190
  • nuug (119)
    • @@ -354,8 +362,13 @@ non-predictable kernel in the early boot.

  • surveillance (9)
    • +<<<<<<< index.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.190
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/archive/2009/08/index.html b/blog/archive/2009/08/index.html index cf44802072..0b63d4fdfa 100644 --- a/blog/archive/2009/08/index.html +++ b/blog/archive/2009/08/index.html @@ -225,7 +225,11 @@ det viser at behovet for fribruks-sjøkart er til stedet.

  • August (6)
    • +<<<<<<< index.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.185 @@ -339,7 +343,11 @@ det viser at behovet for fribruks-sjøkart er til stedet.

  • multimedia (13)
    • +<<<<<<< index.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.185
  • nuug (119)
    • @@ -369,8 +377,13 @@ det viser at behovet for fribruks-sjøkart er til stedet.

  • surveillance (9)
    • +<<<<<<< index.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.185
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/archive/2009/09/index.html b/blog/archive/2009/09/index.html index f61dfcbd45..dc0298c547 100644 --- a/blog/archive/2009/09/index.html +++ b/blog/archive/2009/09/index.html @@ -86,7 +86,11 @@ DRM mÃ¥ anses som et kjøp.

  • August (6)
    • +<<<<<<< index.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.182 @@ -200,7 +204,11 @@ DRM mÃ¥ anses som et kjøp.

  • multimedia (13)
    • +<<<<<<< index.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.182
  • nuug (119)
    • @@ -230,8 +238,13 @@ DRM mÃ¥ anses som et kjøp.

  • surveillance (9)
    • +<<<<<<< index.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.182
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/archive/2009/10/index.html b/blog/archive/2009/10/index.html index cf67f07710..628c6c99c1 100644 --- a/blog/archive/2009/10/index.html +++ b/blog/archive/2009/10/index.html @@ -196,7 +196,11 @@ nettbankkontroll over egne midler. :(
  • August (6)
    • +<<<<<<< index.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.182 @@ -310,7 +314,11 @@ nettbankkontroll over egne midler. :(
  • multimedia (13)
    • +<<<<<<< index.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.182
  • nuug (119)
    • @@ -340,8 +348,13 @@ nettbankkontroll over egne midler. :(
  • surveillance (9)
    • +<<<<<<< index.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.182
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/archive/2009/11/index.html b/blog/archive/2009/11/index.html index 79bee2624e..d9634d8689 100644 --- a/blog/archive/2009/11/index.html +++ b/blog/archive/2009/11/index.html @@ -183,7 +183,11 @@ nye i stedet.

  • August (6)
    • +<<<<<<< index.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.180 @@ -297,7 +301,11 @@ nye i stedet.

  • multimedia (13)
    • +<<<<<<< index.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.180
  • nuug (119)
    • @@ -327,8 +335,13 @@ nye i stedet.

  • surveillance (9)
    • +<<<<<<< index.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.180
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/archive/2009/12/index.html b/blog/archive/2009/12/index.html index 92e53d5155..78b80e39d0 100644 --- a/blog/archive/2009/12/index.html +++ b/blog/archive/2009/12/index.html @@ -164,7 +164,11 @@ pÃ¥ flyplassene.

  • August (6)
    • +<<<<<<< index.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.176 @@ -278,7 +282,11 @@ pÃ¥ flyplassene.

  • multimedia (13)
    • +<<<<<<< index.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.176
  • nuug (119)
    • @@ -308,8 +316,13 @@ pÃ¥ flyplassene.

  • surveillance (9)
    • +<<<<<<< index.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.176
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/archive/2010/01/index.html b/blog/archive/2010/01/index.html index 43e929746f..9088dea98e 100644 --- a/blog/archive/2010/01/index.html +++ b/blog/archive/2010/01/index.html @@ -149,7 +149,11 @@ platforme.

  • August (6)
    • +<<<<<<< index.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.172 @@ -263,7 +267,11 @@ platforme.

  • multimedia (13)
    • +<<<<<<< index.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.172
  • nuug (119)
    • @@ -293,8 +301,13 @@ platforme.

  • surveillance (9)
    • +<<<<<<< index.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.172
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/archive/2010/02/index.html b/blog/archive/2010/02/index.html index d97087d619..ff960b9ee2 100644 --- a/blog/archive/2010/02/index.html +++ b/blog/archive/2010/02/index.html @@ -82,7 +82,11 @@ and have just a few weeks or months to make it happen.

  • August (6)
    • +<<<<<<< index.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.169 @@ -196,7 +200,11 @@ and have just a few weeks or months to make it happen.

  • multimedia (13)
    • +<<<<<<< index.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.169
  • nuug (119)
    • @@ -226,8 +234,13 @@ and have just a few weeks or months to make it happen.

  • surveillance (9)
    • +<<<<<<< index.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.169
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/archive/2010/03/index.html b/blog/archive/2010/03/index.html index ea6a083558..523d26bedd 100644 --- a/blog/archive/2010/03/index.html +++ b/blog/archive/2010/03/index.html @@ -167,7 +167,11 @@ Hr. Fossen. MÃ¥ innrømme at jeg tviler pÃ¥ det.

  • August (6)
    • +<<<<<<< index.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.170 @@ -281,7 +285,11 @@ Hr. Fossen. MÃ¥ innrømme at jeg tviler pÃ¥ det.

  • multimedia (13)
    • +<<<<<<< index.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.170
  • nuug (119)
    • @@ -311,8 +319,13 @@ Hr. Fossen. MÃ¥ innrømme at jeg tviler pÃ¥ det.

  • surveillance (9)
    • +<<<<<<< index.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.170
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/archive/2010/04/index.html b/blog/archive/2010/04/index.html index a885fa5da7..03298a7910 100644 --- a/blog/archive/2010/04/index.html +++ b/blog/archive/2010/04/index.html @@ -221,7 +221,11 @@ please contact us on debian-edu@lists.debian.org.

  • August (6)
    • +<<<<<<< index.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.166 @@ -335,7 +339,11 @@ please contact us on debian-edu@lists.debian.org.

  • multimedia (13)
    • +<<<<<<< index.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.166
  • nuug (119)
    • @@ -365,8 +373,13 @@ please contact us on debian-edu@lists.debian.org.

  • surveillance (9)
    • +<<<<<<< index.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.166
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/archive/2010/05/index.html b/blog/archive/2010/05/index.html index 0e42e18eca..1bb80bf967 100644 --- a/blog/archive/2010/05/index.html +++ b/blog/archive/2010/05/index.html @@ -601,7 +601,11 @@ list of usertagged bugs related to this.

  • August (6)
    • +<<<<<<< index.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.170 @@ -715,7 +719,11 @@ list of usertagged bugs related to this.

  • multimedia (13)
    • +<<<<<<< index.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.170
  • nuug (119)
    • @@ -745,8 +753,13 @@ list of usertagged bugs related to this.

  • surveillance (9)
    • +<<<<<<< index.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.170
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/archive/2010/06/index.html b/blog/archive/2010/06/index.html index b662da7a30..cf3986beb2 100644 --- a/blog/archive/2010/06/index.html +++ b/blog/archive/2010/06/index.html @@ -990,7 +990,11 @@ changes, it will not be an option for Debian Edu based on Squeeze.

  • August (6)
    • +<<<<<<< index.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.162 @@ -1104,7 +1108,11 @@ changes, it will not be an option for Debian Edu based on Squeeze.

  • multimedia (13)
    • +<<<<<<< index.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.162
  • nuug (119)
    • @@ -1134,8 +1142,13 @@ changes, it will not be an option for Debian Edu based on Squeeze.

  • surveillance (9)
    • +<<<<<<< index.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.162
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/archive/2010/07/index.html b/blog/archive/2010/07/index.html index 9a3ec9ce9b..bea55f4400 100644 --- a/blog/archive/2010/07/index.html +++ b/blog/archive/2010/07/index.html @@ -1287,7 +1287,11 @@ it.

  • August (6)
    • +<<<<<<< index.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.134 @@ -1401,7 +1405,11 @@ it.

  • multimedia (13)
    • +<<<<<<< index.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.134
  • nuug (119)
    • @@ -1431,8 +1439,13 @@ it.

  • surveillance (9)
    • +<<<<<<< index.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.134
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/archive/2010/08/index.html b/blog/archive/2010/08/index.html index f0a6b74d21..f62c1a604e 100644 --- a/blog/archive/2010/08/index.html +++ b/blog/archive/2010/08/index.html @@ -1010,7 +1010,11 @@ er fremmet av Erna Solberg, Michael Tetzschner og Trond Helleland.

  • August (6)
    • +<<<<<<< index.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.121 @@ -1124,7 +1128,11 @@ er fremmet av Erna Solberg, Michael Tetzschner og Trond Helleland.

  • multimedia (13)
    • +<<<<<<< index.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.121
  • nuug (119)
    • @@ -1154,8 +1162,13 @@ er fremmet av Erna Solberg, Michael Tetzschner og Trond Helleland.

  • surveillance (9)
    • +<<<<<<< index.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.121
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/archive/2010/09/index.html b/blog/archive/2010/09/index.html index 3c6c82bd51..b4c1e0b5ae 100644 --- a/blog/archive/2010/09/index.html +++ b/blog/archive/2010/09/index.html @@ -413,7 +413,11 @@ eller bare ser meg om etter alternativer.

  • August (6)
    • +<<<<<<< index.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.109 @@ -527,7 +531,11 @@ eller bare ser meg om etter alternativer.

  • multimedia (13)
    • +<<<<<<< index.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.109
  • nuug (119)
    • @@ -557,8 +565,13 @@ eller bare ser meg om etter alternativer.

  • surveillance (9)
    • +<<<<<<< index.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.109
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/archive/2010/10/index.html b/blog/archive/2010/10/index.html index 9a00b54807..4c1072bf95 100644 --- a/blog/archive/2010/10/index.html +++ b/blog/archive/2010/10/index.html @@ -713,7 +713,11 @@ NRK1. :)

  • August (6)
    • +<<<<<<< index.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.100 @@ -827,7 +831,11 @@ NRK1. :)

  • multimedia (13)
    • +<<<<<<< index.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.100
  • nuug (119)
    • @@ -857,8 +865,13 @@ NRK1. :)

  • surveillance (9)
    • +<<<<<<< index.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.100
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/archive/2010/11/index.html b/blog/archive/2010/11/index.html index a39b5bab40..4c6bef3c12 100644 --- a/blog/archive/2010/11/index.html +++ b/blog/archive/2010/11/index.html @@ -1405,7 +1405,11 @@ vote this year.

  • August (6)
    • +<<<<<<< index.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.89 @@ -1519,7 +1523,11 @@ vote this year.

  • multimedia (13)
    • +<<<<<<< index.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.89
  • nuug (119)
    • @@ -1549,8 +1557,13 @@ vote this year.

  • surveillance (9)
    • +<<<<<<< index.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.89
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/archive/2010/12/index.html b/blog/archive/2010/12/index.html index 746704c938..f90783d622 100644 --- a/blog/archive/2010/12/index.html +++ b/blog/archive/2010/12/index.html @@ -1201,7 +1201,11 @@ scared by the sketchy form of the current pages. :)

  • August (6)
    • +<<<<<<< index.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.82 @@ -1315,7 +1319,11 @@ scared by the sketchy form of the current pages. :)

  • multimedia (13)
    • +<<<<<<< index.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.82
  • nuug (119)
    • @@ -1345,8 +1353,13 @@ scared by the sketchy form of the current pages. :)

  • surveillance (9)
    • +<<<<<<< index.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.82
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/archive/2011/01/index.html b/blog/archive/2011/01/index.html index 919ea405cb..eff8f07f28 100644 --- a/blog/archive/2011/01/index.html +++ b/blog/archive/2011/01/index.html @@ -1581,7 +1581,11 @@ for their packages.

  • August (6)
    • +<<<<<<< index.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.68 @@ -1695,7 +1699,11 @@ for their packages.

  • multimedia (13)
    • +<<<<<<< index.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.68
  • nuug (119)
    • @@ -1725,8 +1733,13 @@ for their packages.

  • surveillance (9)
    • +<<<<<<< index.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.68
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/archive/2011/02/index.html b/blog/archive/2011/02/index.html index 7bf853fbcb..d6c6eb14db 100644 --- a/blog/archive/2011/02/index.html +++ b/blog/archive/2011/02/index.html @@ -542,7 +542,11 @@ er en god strategi Ã¥ bruke.

  • August (6)
    • +<<<<<<< index.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.41 @@ -656,7 +660,11 @@ er en god strategi Ã¥ bruke.

  • multimedia (13)
    • +<<<<<<< index.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.41
  • nuug (119)
    • @@ -686,8 +694,13 @@ er en god strategi Ã¥ bruke.

  • surveillance (9)
    • +<<<<<<< index.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.41
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/archive/2011/03/index.html b/blog/archive/2011/03/index.html index 5ccab69767..ac555c7a68 100644 --- a/blog/archive/2011/03/index.html +++ b/blog/archive/2011/03/index.html @@ -548,7 +548,11 @@ fra Stopp DLD-organisasjonen for mer informasjon om dette.

  • August (6)
    • +<<<<<<< index.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.34 @@ -662,7 +666,11 @@ fra Stopp DLD-organisasjonen for mer informasjon om dette.

  • multimedia (13)
    • +<<<<<<< index.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.34
  • nuug (119)
    • @@ -692,8 +700,13 @@ fra Stopp DLD-organisasjonen for mer informasjon om dette.

  • surveillance (9)
    • +<<<<<<< index.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.34
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/archive/2011/04/index.html b/blog/archive/2011/04/index.html index 1c39cdf933..09e14fde13 100644 --- a/blog/archive/2011/04/index.html +++ b/blog/archive/2011/04/index.html @@ -526,7 +526,11 @@ to have a look. Please send feedback to the
  • August (6)
    • +<<<<<<< index.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.31 @@ -640,7 +644,11 @@ to have a look. Please send feedback to the
  • multimedia (13)
    • +<<<<<<< index.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.31
  • nuug (119)
    • @@ -670,8 +678,13 @@ to have a look. Please send feedback to the
  • surveillance (9)
    • +<<<<<<< index.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.31
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/archive/2011/05/index.html b/blog/archive/2011/05/index.html index ba34890ab9..76a6d902df 100644 --- a/blog/archive/2011/05/index.html +++ b/blog/archive/2011/05/index.html @@ -226,7 +226,11 @@ offentlige bør skrinlegges.

  • August (6)
    • +<<<<<<< index.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.24 @@ -340,7 +344,11 @@ offentlige bør skrinlegges.

  • multimedia (13)
    • +<<<<<<< index.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.24
  • nuug (119)
    • @@ -370,8 +378,13 @@ offentlige bør skrinlegges.

  • surveillance (9)
    • +<<<<<<< index.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.24
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/archive/2011/06/index.html b/blog/archive/2011/06/index.html index 4e416db706..3cc3ab271b 100644 --- a/blog/archive/2011/06/index.html +++ b/blog/archive/2011/06/index.html @@ -185,7 +185,11 @@ the time to read their content, the terms are simply unacceptable.

  • August (6)
    • +<<<<<<< index.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.21 @@ -299,7 +303,11 @@ the time to read their content, the terms are simply unacceptable.

  • multimedia (13)
    • +<<<<<<< index.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.21
  • nuug (119)
    • @@ -329,8 +337,13 @@ the time to read their content, the terms are simply unacceptable.

  • surveillance (9)
    • +<<<<<<< index.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.21
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/archive/2011/07/index.html b/blog/archive/2011/07/index.html index e4fd929a58..b41e3afc4b 100644 --- a/blog/archive/2011/07/index.html +++ b/blog/archive/2011/07/index.html @@ -502,7 +502,11 @@ find time to push this forward.

  • August (6)
    • +<<<<<<< index.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.22 @@ -616,7 +620,11 @@ find time to push this forward.

  • multimedia (13)
    • +<<<<<<< index.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.22
  • nuug (119)
    • @@ -646,8 +654,13 @@ find time to push this forward.

  • surveillance (9)
    • +<<<<<<< index.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.22
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/archive/2011/08/index.html b/blog/archive/2011/08/index.html index 7cb51d42d4..72168a9587 100644 --- a/blog/archive/2011/08/index.html +++ b/blog/archive/2011/08/index.html @@ -347,7 +347,11 @@ Jeg hÃ¥per det blir bedre etter flytting i oktober.

  • August (6)
    • +<<<<<<< index.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.13 @@ -461,7 +465,11 @@ Jeg hÃ¥per det blir bedre etter flytting i oktober.

  • multimedia (13)
    • +<<<<<<< index.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.13
  • nuug (119)
    • @@ -491,8 +499,13 @@ Jeg hÃ¥per det blir bedre etter flytting i oktober.

  • surveillance (9)
    • +<<<<<<< index.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.13
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/archive/2011/09/09.rss b/blog/archive/2011/09/09.rss index ceb6c19fc0..32b42ed353 100644 --- a/blog/archive/2011/09/09.rss +++ b/blog/archive/2011/09/09.rss @@ -64,6 +64,7 @@ føre til at flere tar i bruk fri programvare.</p> +<<<<<<< 09.rss Noen problemer rundt unikt nummererte stemmesedler i norske valg http://people.skolelinux.org/pere/blog/Noen_problemer_rundt_unikt_nummererte_stemmesedler_i_norske_valg.html @@ -126,5 +127,84 @@ programvare, og tilgjengelig fra + + Kommunevalget mÃ¥ visst kontrollregnes pÃ¥ + http://people.skolelinux.org/pere/blog/Kommunevalget_m__visst_kontrollregnes_p_.html + http://people.skolelinux.org/pere/blog/Kommunevalget_m__visst_kontrollregnes_p_.html + Wed, 14 Sep 2011 10:35:00 +0200 + <p>En artikkel i aftenbladet pÃ¥stÃ¥r at valgsystemet til EDB Ergogroup +<a href="http://www.aftenbladet.no/innenriks/politikk/valg/De-Grnne-regner-seg-inn-i-bystyret-2864487.html">ikke +regner riktig mandatfordeling</a> i Stavanger. Det høres for meg ut +som om innbyggerne i Norge er nødt til Ã¥ kontrollregne pÃ¥ +mandatfordelingen for Ã¥ sikre at valget gÃ¥r riktig for seg. Det tar +jeg som nok et argument for nøyere kontroll av det norske +valgsystemet.</p> + + + +======= + + Noen problemer rundt unikt nummererte stemmesedler i norske valg + http://people.skolelinux.org/pere/blog/Noen_problemer_rundt_unikt_nummererte_stemmesedler_i_norske_valg.html + http://people.skolelinux.org/pere/blog/Noen_problemer_rundt_unikt_nummererte_stemmesedler_i_norske_valg.html + Tue, 13 Sep 2011 16:00:00 +0200 + <p>I digi.no forklarer Ergo Group at gÃ¥rdagens problemer med +opptelling av stemmesedler ved kommunevalget var at +<a href="http://www.digi.no/877938/ikke-programmeringsshy%3Bfeil-i-valgshy%3Bsystemet">noen +stemmesedler ikke hadde unike løpenummer</a>, og at programvaren som +ble brukt til telling ikke var laget for Ã¥ hÃ¥ndtere dette. Jeg ble +svært overrasket over Ã¥ lese at norske stemmesedler har unike +løpenummer, da min forstÃ¥else er at det gÃ¥r pÃ¥ bekostning av kravet om +hemmelige valg.</p> + +<p>Jeg har ikke god oversikt over hvilke problemer dette kan skape for +hemmelig valg, men her er noen scenarier som virker problematiske for +meg:</p> + +<p>(1) Jomar og Bertil avtaler at Bertil skal stemme pÃ¥ Lurepartiet +med stemmeseddelen som Bertil fÃ¥r utlevert fra Jomar, og belønnes for +dette. Stemmeseddelen har et unikt løpenummer, og ved opptellingen +sjekker Jomar at stemmeseddelen til Lurepartiet det unike løpenummeret +er med i stemmesedlene som ble talt opp før Bertil fÃ¥r sin belønning. +Unike løpenummer legger sÃ¥ vidt jeg kan forstÃ¥ opp til kjøp og salg av +stemmer.</p> + +<p>(2) Jomar har ogsÃ¥ jobb som valgobservatør, og har gÃ¥tt igjennom +avlukkene og notert parti og løpenummer for alle stemmesedlene i +avlukkene. Har er i tillegg jevnlig innom og sjekker hvilke +løpenummer som er igjen i avlukkene (lar seg ganske raskt og enkelt +gjøre med en mobiltelefon med kamera som kan ta bilder av alle +løpenumrene). NÃ¥r en person han vil vite hva stemmer kommer innom, +sammenligner han stemmesedler i avlukkene før og etter at vedkommende +har vært innom, og sjekker sÃ¥ om løpenummeret som var pÃ¥ stemmeseddel +(eller sedlene) som forsvant fra avlukket dukker opp under +opptellingen. Det kan pÃ¥ den mÃ¥ten være mulig Ã¥ finne ut hva en +person stemte. Hvis personen tar med seg en stemmeseddel fra alle +partiene vil det fortsatt være mulig Ã¥ finne ut hvilken av disse som +ble talt opp, slik at en ikke kan beskytte seg pÃ¥ det viset./p> + +<p>Jeg er ikke sikker pÃ¥ hvor realistiske disse scenariene er i dag, +dvs. hvilke andre prosedyrer som finnes i det norske valget for Ã¥ +hindre dette.</p> + +<p>Det er dog ingen tvil om at det er lurt Ã¥ nummerere stemmesedler +ved opptelling for Ã¥ sikre at ingen forsvinner i prosessen med Ã¥ telle +opp stemmer, men det mÃ¥ gjøres nÃ¥r stemmeurnene Ã¥pnes og ikke før +innbyggerne avgir sin stemme.</p> + +<p>Under Go Open 2009 presenterte Mitch Trachtenberg fra Humboldt +County, California hvordan +<a href="http://goopen2009.friprog.no/program/48-freevalg">de laget et +system som kontrolltalte stemmene</a> der ved hjelp av en scanner med +arkmater og fri programvare. Der ble stemmesedlene unikt nummerert +før scanning, og det er laget en CD med bilder av alle stemmesedler +slik at enhver kan kontrolltelle stemmene selv hvis de ønsker det. +Kanskje en ide ogsÃ¥ for Norge? Programvaren er sÃ¥ vidt jeg vet fri +programvare, og tilgjengelig fra +<a href="http://www.tevsystems.com/">hans nettsted</a></p> + + + +>>>>>>> 1.2 diff --git a/blog/archive/2011/09/index.html b/blog/archive/2011/09/index.html index d523732a8c..716c28530e 100644 --- a/blog/archive/2011/09/index.html +++ b/blog/archive/2011/09/index.html @@ -91,6 +91,7 @@ føre til at flere tar i bruk fri programvare.

    +<<<<<<< index.html
    Noen problemer rundt unikt nummererte stemmesedler i norske valg @@ -165,6 +166,109 @@ programvare, og tilgjengelig fra
    +
    +
    + Kommunevalget må visst kontrollregnes på +
    +
    + 14th September 2011 +
    +
    +

    En artikkel i aftenbladet påstår at valgsystemet til EDB Ergogroup +ikke +regner riktig mandatfordeling i Stavanger. Det høres for meg ut +som om innbyggerne i Norge er nødt til å kontrollregne på +mandatfordelingen for å sikre at valget går riktig for seg. Det tar +jeg som nok et argument for nøyere kontroll av det norske +valgsystemet.

    + +
    +
    + + + Tags: norsk, valg. + + +
    +
    +
    + +======= +
    +
    + Noen problemer rundt unikt nummererte stemmesedler i norske valg +
    +
    + 13th September 2011 +
    +
    +

    I digi.no forklarer Ergo Group at gårdagens problemer med +opptelling av stemmesedler ved kommunevalget var at +noen +stemmesedler ikke hadde unike løpenummer, og at programvaren som +ble brukt til telling ikke var laget for å håndtere dette. Jeg ble +svært overrasket over å lese at norske stemmesedler har unike +løpenummer, da min forståelse er at det går på bekostning av kravet om +hemmelige valg.

    + +

    Jeg har ikke god oversikt over hvilke problemer dette kan skape for +hemmelig valg, men her er noen scenarier som virker problematiske for +meg:

    + +

    (1) Jomar og Bertil avtaler at Bertil skal stemme på Lurepartiet +med stemmeseddelen som Bertil får utlevert fra Jomar, og belønnes for +dette. Stemmeseddelen har et unikt løpenummer, og ved opptellingen +sjekker Jomar at stemmeseddelen til Lurepartiet det unike løpenummeret +er med i stemmesedlene som ble talt opp før Bertil får sin belønning. +Unike løpenummer legger så vidt jeg kan forstå opp til kjøp og salg av +stemmer.

    + +

    (2) Jomar har også jobb som valgobservatør, og har gått igjennom +avlukkene og notert parti og løpenummer for alle stemmesedlene i +avlukkene. Har er i tillegg jevnlig innom og sjekker hvilke +løpenummer som er igjen i avlukkene (lar seg ganske raskt og enkelt +gjøre med en mobiltelefon med kamera som kan ta bilder av alle +løpenumrene). Når en person han vil vite hva stemmer kommer innom, +sammenligner han stemmesedler i avlukkene før og etter at vedkommende +har vært innom, og sjekker så om løpenummeret som var på stemmeseddel +(eller sedlene) som forsvant fra avlukket dukker opp under +opptellingen. Det kan på den måten være mulig å finne ut hva en +person stemte. Hvis personen tar med seg en stemmeseddel fra alle +partiene vil det fortsatt være mulig å finne ut hvilken av disse som +ble talt opp, slik at en ikke kan beskytte seg på det viset./p> + +

    Jeg er ikke sikker på hvor realistiske disse scenariene er i dag, +dvs. hvilke andre prosedyrer som finnes i det norske valget for å +hindre dette.

    + +

    Det er dog ingen tvil om at det er lurt å nummerere stemmesedler +ved opptelling for å sikre at ingen forsvinner i prosessen med å telle +opp stemmer, men det må gjøres når stemmeurnene åpnes og ikke før +innbyggerne avgir sin stemme.

    + +

    Under Go Open 2009 presenterte Mitch Trachtenberg fra Humboldt +County, California hvordan +de laget et +system som kontrolltalte stemmene der ved hjelp av en scanner med +arkmater og fri programvare. Der ble stemmesedlene unikt nummerert +før scanning, og det er laget en CD med bilder av alle stemmesedler +slik at enhver kan kontrolltelle stemmene selv hvis de ønsker det. +Kanskje en ide også for Norge? Programvaren er så vidt jeg vet fri +programvare, og tilgjengelig fra +hans nettsted

    + +
    +
    + + + Tags: norsk, personvern, valg. + + +
    +
    +
    + +>>>>>>> 1.2

    RSS Feed