From: Petter Reinholdtsen Date: Wed, 14 Sep 2011 08:39:05 +0000 (+0000) Subject: Generated. X-Git-Url: https://pere.pagekite.me/gitweb/homepage.git/commitdiff_plain/55faa231861ec048a966fbed3900a9a282cbb381 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 c4ff4e4511..0a4ee45e01 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,11 +92,7 @@ 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 @@ -210,11 +206,7 @@ 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)
    • @@ -244,13 +236,8 @@ 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 329addea47..04efa68f69 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,11 +72,7 @@ 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 @@ -190,11 +186,7 @@ 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)
    • @@ -224,13 +216,8 @@ 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 f6370acc38..25d7f68983 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,11 +78,7 @@ firmwaren. :)

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

  • multimedia (13)
    • -<<<<<<< 2_Spykee_roboter_i_hus__n__skal_det_lekes.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.2
  • nuug (119)
    • @@ -230,13 +222,8 @@ 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 2df1479392..81e33f60de 100644 --- a/blog/3D_printing_brer_om_seg___fabrikkene_best_r.html +++ b/blog/3D_printing_brer_om_seg___fabrikkene_best_r.html @@ -89,11 +89,7 @@ massemarkedet.

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

  • multimedia (13)
    • -<<<<<<< 3D_printing_brer_om_seg___fabrikkene_best_r.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.2
  • nuug (119)
    • @@ -241,13 +233,8 @@ 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 f651f5a4ff..b7c329facd 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,11 +86,7 @@ such service?

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

  • multimedia (13)
    • -<<<<<<< A_Norwegian_FixMyStreet_have_kept_me_busy_the_last_few_weeks.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.27
  • nuug (119)
    • @@ -238,13 +230,8 @@ 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 2dba814a4f..9d97672cbb 100644 --- a/blog/A_manual_for_standards_wars___.html +++ b/blog/A_manual_for_standards_wars___.html @@ -62,11 +62,7 @@ following the standards wars of today.

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

  • multimedia (13)
    • -<<<<<<< A_manual_for_standards_wars___.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.146
  • nuug (119)
    • @@ -214,13 +206,8 @@ 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 9e2f4e2e81..56891e7d34 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,11 +74,7 @@ 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 @@ -192,11 +188,7 @@ 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)
    • @@ -226,13 +218,8 @@ 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 7a2d888c3f..cd7e4c0a50 100644 --- a/blog/Amigafolket_holder_ut.html +++ b/blog/Amigafolket_holder_ut.html @@ -65,11 +65,7 @@ pakke. Kanskje Aros kunne vært interessant for et NUUG-foredrag?

  • August (6)
    • -<<<<<<< Amigafolket_holder_ut.html
  • September (3)
    • -======= -
  • September (2)
    • ->>>>>>> 1.252 @@ -183,11 +179,7 @@ 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)
    • @@ -217,13 +209,8 @@ 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 8c4822cb39..9e8afb3faf 100644 --- a/blog/Anonym_ferdsel_er_en_menneskerett.html +++ b/blog/Anonym_ferdsel_er_en_menneskerett.html @@ -85,11 +85,7 @@ kollektivtrafikken i Oslo. Jeg synes det er hÃ¥rreisende.

  • August (6)
    • -<<<<<<< Anonym_ferdsel_er_en_menneskerett.html
  • September (3)
    • -======= -
  • September (2)
    • ->>>>>>> 1.100 @@ -203,11 +199,7 @@ 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)
    • @@ -237,13 +229,8 @@ 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 65cc39680b..58433e16a9 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,11 +107,7 @@ 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 @@ -225,11 +221,7 @@ 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)
    • @@ -259,13 +251,8 @@ 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 6556c092b4..25c1e0bffa 100644 --- a/blog/Automatic_Munin_and_Nagios_configuration.html +++ b/blog/Automatic_Munin_and_Nagios_configuration.html @@ -101,11 +101,7 @@ everything is taken care of.

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

  • multimedia (13)
    • -<<<<<<< Automatic_Munin_and_Nagios_configuration.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.171
  • nuug (119)
    • @@ -253,13 +245,8 @@ 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 177526182f..0f590b4c0f 100644 --- a/blog/Automatic_upgrade_testing_from_Lenny_to_Squeeze.html +++ b/blog/Automatic_upgrade_testing_from_Lenny_to_Squeeze.html @@ -175,11 +175,7 @@ packages.

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

  • multimedia (13)
    • -<<<<<<< Automatic_upgrade_testing_from_Lenny_to_Squeeze.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.143
  • nuug (119)
    • @@ -327,13 +319,8 @@ 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 af3a270525..814794a382 100644 --- a/blog/Avisene_i_endring.html +++ b/blog/Avisene_i_endring.html @@ -62,11 +62,7 @@ eksisterer. Det blir spennende Ã¥ se hva vi ender opp med.

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

  • multimedia (13)
    • -<<<<<<< Avisene_i_endring.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.219
  • nuug (119)
    • @@ -214,13 +206,8 @@ 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 9b99cbe19d..a913cd31d5 100644 --- a/blog/BSAs_p_stander_om_piratkopiering_m_ter_motstand.html +++ b/blog/BSAs_p_stander_om_piratkopiering_m_ter_motstand.html @@ -83,11 +83,7 @@ pÃ¥ Slashdot.

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

  • multimedia (13)
    • -<<<<<<< BSAs_p_stander_om_piratkopiering_m_ter_motstand.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.2
  • nuug (119)
    • @@ -235,13 +227,8 @@ 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 de622f92e0..a8bf524300 100644 --- a/blog/Bedre_kommunegrense_for_Oslo_i_OpenStreetmap_org.html +++ b/blog/Bedre_kommunegrense_for_Oslo_i_OpenStreetmap_org.html @@ -137,11 +137,7 @@ informasjon.

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

  • multimedia (13)
    • -<<<<<<< Bedre_kommunegrense_for_Oslo_i_OpenStreetmap_org.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.39
  • nuug (119)
    • @@ -289,13 +281,8 @@ 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 1888b7015c..9329baa0c1 100644 --- a/blog/Best___ikke_fortelle_noen_at_streaming_er_nedlasting___.html +++ b/blog/Best___ikke_fortelle_noen_at_streaming_er_nedlasting___.html @@ -197,11 +197,7 @@ NRK1. :)

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

  • multimedia (13)
    • -<<<<<<< Best___ikke_fortelle_noen_at_streaming_er_nedlasting___.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.2
  • nuug (119)
    • @@ -349,13 +341,8 @@ 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 5efe971efa..63dadd6178 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,11 +88,7 @@ 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 @@ -206,11 +202,7 @@ 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)
    • @@ -240,13 +232,8 @@ 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 764f8af041..ea1180e40f 100644 --- a/blog/Bombing_og_skyting.html +++ b/blog/Bombing_og_skyting.html @@ -65,11 +65,7 @@ dvs. Ã¥ gjøre samfunnet vÃ¥rt verre for innbyggerne.

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

  • multimedia (13)
    • -<<<<<<< Bombing_og_skyting.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.15
  • nuug (119)
    • @@ -217,13 +209,8 @@ 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 eca0fb092b..ceabf86769 100644 --- a/blog/Broken_hard_link_handling_with_sshfs.html +++ b/blog/Broken_hard_link_handling_with_sshfs.html @@ -79,11 +79,7 @@ git from
  • August (6)
    • -<<<<<<< Broken_hard_link_handling_with_sshfs.html
  • September (3)
    • -======= -
  • September (2)
    • ->>>>>>> 1.106 @@ -197,11 +193,7 @@ git from
  • multimedia (13)
    • -<<<<<<< Broken_hard_link_handling_with_sshfs.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.106
  • nuug (119)
    • @@ -231,13 +223,8 @@ 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 a5af38c857..559da701ba 100644 --- a/blog/Broken_umask_handling_with_sshfs.html +++ b/blog/Broken_umask_handling_with_sshfs.html @@ -155,11 +155,7 @@ 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 @@ -273,11 +269,7 @@ 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)
    • @@ -307,13 +299,8 @@ 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 31a5b400f9..63340b58e9 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,11 +254,7 @@ 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 @@ -372,11 +368,7 @@ 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)
    • @@ -406,13 +398,8 @@ 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 095a289521..15deac82be 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,11 +97,7 @@ like this.

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

  • multimedia (13)
    • -<<<<<<< Calling_tasksel_like_the_installer__while_still_getting_useful_output.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.135
  • nuug (119)
    • @@ -249,13 +241,8 @@ 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 5a964d8aa6..9b323af70c 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,11 +216,7 @@ do so.

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

  • multimedia (13)
    • -<<<<<<< Checking_server_hardware_support_status_for_Dell__HP_and_IBM_servers.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.227
  • nuug (119)
    • @@ -368,13 +360,8 @@ 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 91015a1c85..b4ea7a431c 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,11 +130,7 @@ 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 @@ -248,11 +244,7 @@ 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)
    • @@ -282,13 +274,8 @@ 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 5d0db5c4b1..54d7d00a9e 100644 --- a/blog/Circular_package_dependencies_harms_apt_recovery.html +++ b/blog/Circular_package_dependencies_harms_apt_recovery.html @@ -104,11 +104,7 @@ it.

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

  • multimedia (13)
    • -<<<<<<< Circular_package_dependencies_harms_apt_recovery.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.118
  • nuug (119)
    • @@ -256,13 +248,8 @@ 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 42d0dab0e8..7b83bb98c3 100644 --- a/blog/Combining_PowerDNS_and_ISC_DHCP_LDAP_objects.html +++ b/blog/Combining_PowerDNS_and_ISC_DHCP_LDAP_objects.html @@ -113,11 +113,7 @@ 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 @@ -231,11 +227,7 @@ 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)
    • @@ -265,13 +257,8 @@ 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 b7e44fa6d4..9801c2836d 100644 --- a/blog/DND_hedrer_overv_kning_av_barn_med_Rosingsprisen.html +++ b/blog/DND_hedrer_overv_kning_av_barn_med_Rosingsprisen.html @@ -93,11 +93,7 @@ lese alle de tre bøkene.

  • August (6)
    • -<<<<<<< DND_hedrer_overv_kning_av_barn_med_Rosingsprisen.html
  • September (3)
    • -======= -
  • September (2)
    • ->>>>>>> 1.4 @@ -211,11 +207,7 @@ 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)
    • @@ -245,13 +237,8 @@ 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 d567c7abf5..92506979be 100644 --- a/blog/Danmark_g_r_for_ODF_.html +++ b/blog/Danmark_g_r_for_ODF_.html @@ -72,11 +72,7 @@ platforme.

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

  • multimedia (13)
    • -<<<<<<< Danmark_g_r_for_ODF_.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.2
  • nuug (119)
    • @@ -224,13 +216,8 @@ 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 348aa2ffd7..5f73aab8fa 100644 --- a/blog/Datalagringsdirektivet__et_angrep_p__demokratiet.html +++ b/blog/Datalagringsdirektivet__et_angrep_p__demokratiet.html @@ -110,11 +110,7 @@ fra Stopp DLD-organisasjonen for mer informasjon om dette.

  • August (6)
    • -<<<<<<< Datalagringsdirektivet__et_angrep_p__demokratiet.html
  • September (3)
    • -======= -
  • September (2)
    • ->>>>>>> 1.4 @@ -228,11 +224,7 @@ 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)
    • @@ -262,13 +254,8 @@ 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 9d5c3a5aa0..e43ef4b175 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,11 +168,7 @@ 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 @@ -286,11 +282,7 @@ 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)
    • @@ -320,13 +312,8 @@ 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 dab56eaad4..d890b9810b 100644 --- a/blog/Datatilsynet_svarer_om_Bilkollektivets__nske_om_GPS_sporing.html +++ b/blog/Datatilsynet_svarer_om_Bilkollektivets__nske_om_GPS_sporing.html @@ -155,11 +155,7 @@ 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 @@ -273,11 +269,7 @@ 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)
    • @@ -307,13 +299,8 @@ 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 eec2ff6f15..73e7f9db7b 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,11 +70,7 @@ 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 @@ -188,11 +184,7 @@ 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)
    • @@ -222,13 +214,8 @@ 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 2548893833..55ac7ddf33 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,11 +71,7 @@ vote this year.

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

  • multimedia (13)
    • -<<<<<<< Debian_Edu_development_gathering_and_General_Assembly_for_FRiSK.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.72
  • nuug (119)
    • @@ -223,13 +215,8 @@ 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 37f086e3ae..c1b18885c8 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,11 +86,7 @@ uses.

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

  • multimedia (13)
    • -<<<<<<< Debian_Edu_roaming_workstation___at_the_university_of_Oslo.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.117
  • nuug (119)
    • @@ -238,13 +230,8 @@ 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 20a6242883..13daba5721 100644 --- a/blog/Debian_boots_quicker_and_quicker.html +++ b/blog/Debian_boots_quicker_and_quicker.html @@ -102,11 +102,7 @@ insserv'. Will need to test if that work. :)

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

  • multimedia (13)
    • -<<<<<<< Debian_boots_quicker_and_quicker.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.192
  • nuug (119)
    • @@ -254,13 +246,8 @@ 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 42c7564406..e36d2fc6d2 100644 --- a/blog/Debian_has_switched_to_dependency_based_boot_sequencing.html +++ b/blog/Debian_has_switched_to_dependency_based_boot_sequencing.html @@ -67,11 +67,7 @@ non-predictable kernel in the early boot.

  • August (6)
    • -<<<<<<< Debian_has_switched_to_dependency_based_boot_sequencing.html
  • September (3)
    • -======= -
  • September (2)
    • ->>>>>>> 1.187 @@ -185,11 +181,7 @@ 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)
    • @@ -219,13 +211,8 @@ 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 1ffbfdcc59..8255a46f95 100644 --- a/blog/Debian_in_3D.html +++ b/blog/Debian_in_3D.html @@ -62,11 +62,7 @@ thingiverse blog.

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

  • multimedia (13)
    • -<<<<<<< Debian_in_3D.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.82
  • nuug (119)
    • @@ -214,13 +206,8 @@ 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 de55be24cd..bf1f509162 100644 --- a/blog/Det_totalit_re_samfunn_kommer_stadig_n_rmere.html +++ b/blog/Det_totalit_re_samfunn_kommer_stadig_n_rmere.html @@ -102,11 +102,7 @@ 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 @@ -220,11 +216,7 @@ 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)
    • @@ -254,13 +246,8 @@ 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 c60359b84c..7a43791ad5 100644 --- a/blog/Det_vanskelige_Lisensvalget___ikke_lag_din_egen.html +++ b/blog/Det_vanskelige_Lisensvalget___ikke_lag_din_egen.html @@ -152,11 +152,7 @@ og endrer pÃ¥ betingelsene.

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

  • multimedia (13)
    • -<<<<<<< Det_vanskelige_Lisensvalget___ikke_lag_din_egen.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.243
  • nuug (119)
    • @@ -304,13 +296,8 @@ 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 44973e0ee8..0edb70e767 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,11 +70,7 @@ of these cards.

  • August (6)
    • -<<<<<<< Devcamp_brought_us_closer_to_the_Lenny_based_Debian_Edu_release.html
  • September (3)
    • -======= -
  • September (2)
    • ->>>>>>> 1.248 @@ -188,11 +184,7 @@ 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)
    • @@ -222,13 +214,8 @@ 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 34e452c0fa..023763d4bb 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,11 +87,7 @@ 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 @@ -205,11 +201,7 @@ 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)
    • @@ -239,13 +231,8 @@ 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 0a9a0ed04e..a38821c409 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,11 +79,7 @@ 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 @@ -197,11 +193,7 @@ 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)
    • @@ -231,13 +223,8 @@ 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 2d3e478547..fd308c1dc6 100644 --- a/blog/EU_parlamentet_raner_fellesskapet_for_musikk.html +++ b/blog/EU_parlamentet_raner_fellesskapet_for_musikk.html @@ -75,11 +75,7 @@ uten musikk med bruksbegresninger.

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

  • multimedia (13)
    • -<<<<<<< EU_parlamentet_raner_fellesskapet_for_musikk.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.205
  • nuug (119)
    • @@ -227,13 +219,8 @@ 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 a488c583bd..c088d99b95 100644 --- a/blog/Elektronikkbyggesettet_for_reprapen_sporet_opp.html +++ b/blog/Elektronikkbyggesettet_for_reprapen_sporet_opp.html @@ -72,11 +72,7 @@ jul.

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

  • multimedia (13)
    • -<<<<<<< Elektronikkbyggesettet_for_reprapen_sporet_opp.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.246
  • nuug (119)
    • @@ -224,13 +216,8 @@ 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 2cb81e652b..1420cfaa13 100644 --- a/blog/Elektronikkbyggesettet_kommer_fram_p__andre_fors_k.html +++ b/blog/Elektronikkbyggesettet_kommer_fram_p__andre_fors_k.html @@ -95,11 +95,7 @@ pÃ¥stÃ¥r det skulle skje i 2008.

  • August (6)
    • -<<<<<<< Elektronikkbyggesettet_kommer_fram_p__andre_fors_k.html
  • September (3)
    • -======= -
  • September (2)
    • ->>>>>>> 1.2 @@ -213,11 +209,7 @@ 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)
    • @@ -247,13 +239,8 @@ 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 23b3d9a1eb..3912811921 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,11 +94,7 @@ 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 @@ -212,11 +208,7 @@ 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)
    • @@ -246,13 +238,8 @@ 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 f6304f0501..0b17e5904d 100644 --- a/blog/Elektronisk_stemmegiving_over_Internet_og_datalagringsdirektivet.html +++ b/blog/Elektronisk_stemmegiving_over_Internet_og_datalagringsdirektivet.html @@ -114,11 +114,7 @@ systemet som ikke kan kontrolleres av hver enkelt innbygger.

  • August (6)
    • -<<<<<<< Elektronisk_stemmegiving_over_Internet_og_datalagringsdirektivet.html
  • September (3)
    • -======= -
  • September (2)
    • ->>>>>>> 1.7 @@ -232,11 +228,7 @@ 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)
    • @@ -266,13 +258,8 @@ 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 4bf0fa611e..8741dca304 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,11 +80,7 @@ publisert offentlig pÃ¥ web.

  • August (6)
    • -<<<<<<< En_skam_at_det_ikke_finnes_ordrett_referat_fra_norske_domstoler.html
  • September (3)
    • -======= -
  • September (2)
    • ->>>>>>> 1.220 @@ -198,11 +194,7 @@ 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)
    • @@ -232,13 +224,8 @@ 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 de756c6e0e..78db2aeeb4 100644 --- a/blog/Endelig_er_Debian_Lenny_gitt_ut.html +++ b/blog/Endelig_er_Debian_Lenny_gitt_ut.html @@ -68,11 +68,7 @@ bootsekvens tilgjengelig i stabil utgave, vha pakken
  • August (6)
    • -<<<<<<< Endelig_er_Debian_Lenny_gitt_ut.html
  • September (3)
    • -======= -
  • September (2)
    • ->>>>>>> 1.229 @@ -186,11 +182,7 @@ bootsekvens tilgjengelig i stabil utgave, vha pakken
  • multimedia (13)
    • -<<<<<<< Endelig_er_Debian_Lenny_gitt_ut.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.229
  • nuug (119)
    • @@ -220,13 +212,8 @@ 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 f30bb2cb64..d4811410c1 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,11 +79,7 @@ stavekontrollen.

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

  • multimedia (13)
    • -<<<<<<< Endelig_norsk_stavekontroll_med_st_tte_for_ord_med_bindestrek.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.2
  • nuug (119)
    • @@ -231,13 +223,8 @@ 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 98b4d9fb39..7ad57502f1 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,11 +72,7 @@ GNU.
  • August (6)
    • -<<<<<<< Endelig_operativt_webbasert_medlemsregister_for_Fri_programvare_i_skolen.html
  • September (3)
    • -======= -
  • September (2)
    • ->>>>>>> 1.178 @@ -190,11 +186,7 @@ GNU.
  • multimedia (13)
    • -<<<<<<< Endelig_operativt_webbasert_medlemsregister_for_Fri_programvare_i_skolen.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.178
  • nuug (119)
    • @@ -224,13 +216,8 @@ 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 c12d57b647..c2b1557466 100644 --- a/blog/Et_bilde_p__problemet_med_programvarepatenter.html +++ b/blog/Et_bilde_p__problemet_med_programvarepatenter.html @@ -70,11 +70,7 @@ temaet. Alle er hjertelig velkomne som abonnenter.

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

  • multimedia (13)
    • -<<<<<<< Et_bilde_p__problemet_med_programvarepatenter.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.2
  • nuug (119)
    • @@ -222,13 +214,8 @@ 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 6a9e597aab..cfeb693af3 100644 --- a/blog/Experimental_Open311_API_for_the_mySociety_fixmystreet_system.html +++ b/blog/Experimental_Open311_API_for_the_mySociety_fixmystreet_system.html @@ -72,11 +72,7 @@ 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 @@ -190,11 +186,7 @@ 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)
    • @@ -224,13 +216,8 @@ 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 3b033ef66c..5c4d68f20c 100644 --- a/blog/FAD_lanserer_reiseregningsskjema_som_fri_programvare.html +++ b/blog/FAD_lanserer_reiseregningsskjema_som_fri_programvare.html @@ -133,11 +133,7 @@ gjorde det litt vanskeligere for brukeren.

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

  • multimedia (13)
    • -<<<<<<< FAD_lanserer_reiseregningsskjema_som_fri_programvare.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.245
  • nuug (119)
    • @@ -285,13 +277,8 @@ 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 4f2577389f..bf5bfe72a4 100644 --- a/blog/F_rste_NUUG_fordrag_sendt_p__TV.html +++ b/blog/F_rste_NUUG_fordrag_sendt_p__TV.html @@ -73,11 +73,7 @@ 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 @@ -191,11 +187,7 @@ 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)
    • @@ -225,13 +217,8 @@ 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 bf9f5f8548..033f3af6df 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,11 +87,7 @@ 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 @@ -205,11 +201,7 @@ 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)
    • @@ -239,13 +231,8 @@ 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 315cafe39a..b6b875f5ab 100644 --- a/blog/F_rste_vellykkede_videostr_m_fra_NUUG.html +++ b/blog/F_rste_vellykkede_videostr_m_fra_NUUG.html @@ -66,11 +66,7 @@ webserver og komprimert.

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

  • multimedia (13)
    • -<<<<<<< F_rste_vellykkede_videostr_m_fra_NUUG.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.2
  • nuug (119)
    • @@ -218,13 +210,8 @@ 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 b37b216db1..8f4eed9fa9 100644 --- a/blog/FiksGataMi___fylkesoversikt_p__kart.html +++ b/blog/FiksGataMi___fylkesoversikt_p__kart.html @@ -92,11 +92,7 @@ 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 @@ -210,11 +206,7 @@ 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)
    • @@ -244,13 +236,8 @@ 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 59d6fb9e09..4c542bcaa7 100644 --- a/blog/FiksGataMi_lansert__og_responsen_har_v_rt_overveldende.html +++ b/blog/FiksGataMi_lansert__og_responsen_har_v_rt_overveldende.html @@ -114,11 +114,7 @@ ses kanskje der?

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

  • multimedia (13)
    • -<<<<<<< FiksGataMi_lansert__og_responsen_har_v_rt_overveldende.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.2
  • nuug (119)
    • @@ -266,13 +258,8 @@ 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 d60daafde4..fbc239bf18 100644 --- a/blog/Fiksgatami_begynner___ta_form.html +++ b/blog/Fiksgatami_begynner___ta_form.html @@ -74,11 +74,7 @@ med dem. Dette blir bra.

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

  • multimedia (13)
    • -<<<<<<< Fiksgatami_begynner___ta_form.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.2
  • nuug (119)
    • @@ -226,13 +218,8 @@ 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 d9b5b67eaf..4668719549 100644 --- a/blog/Fiksgatami_tar_form___snart_klar_for_test.html +++ b/blog/Fiksgatami_tar_form___snart_klar_for_test.html @@ -103,11 +103,7 @@ 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 @@ -221,11 +217,7 @@ 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)
    • @@ -255,13 +247,8 @@ 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 d070829d1f..d3863ea89f 100644 --- a/blog/Fildeling_er_lovlig___ulovlig_fildeling_er_ulovlig.html +++ b/blog/Fildeling_er_lovlig___ulovlig_fildeling_er_ulovlig.html @@ -72,11 +72,7 @@ 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 @@ -190,11 +186,7 @@ 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)
    • @@ -224,13 +216,8 @@ 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 3a9d25a7bc..41e689ae3d 100644 --- a/blog/Fin_minnemarkering_p__Stortinget_i_dag.html +++ b/blog/Fin_minnemarkering_p__Stortinget_i_dag.html @@ -79,11 +79,7 @@ og bør aldri glemmes.

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

  • multimedia (13)
    • -<<<<<<< Fin_minnemarkering_p__Stortinget_i_dag.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.2
  • nuug (119)
    • @@ -231,13 +223,8 @@ 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 b50fe2ca40..e12e75d55e 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,11 +72,7 @@ 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 @@ -190,11 +186,7 @@ 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)
    • @@ -224,13 +216,8 @@ 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 026f905147..6ebc9f803e 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,11 +167,7 @@ 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 @@ -285,11 +281,7 @@ 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)
    • @@ -319,13 +311,8 @@ 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 89210ec30f..e25bf976da 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,11 +85,7 @@ please let me know.

  • August (6)
    • -<<<<<<< First_version_of_a_Perl_library_to_control_the_Spykee_robot.html
  • September (3)
    • -======= -
  • September (2)
    • ->>>>>>> 1.94 @@ -203,11 +199,7 @@ 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)
    • @@ -237,13 +229,8 @@ 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 975df5fd80..eae8ec41ba 100644 --- a/blog/Flytting_er_et_tidssluk.html +++ b/blog/Flytting_er_et_tidssluk.html @@ -65,11 +65,7 @@ Jeg hÃ¥per det blir bedre etter flytting i oktober.

  • August (6)
    • -<<<<<<< Flytting_er_et_tidssluk.html
  • September (3)
    • -======= -
  • September (2)
    • ->>>>>>> 1.4 @@ -183,11 +179,7 @@ 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)
    • @@ -217,13 +209,8 @@ 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 d3297db2dc..20f3562358 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,11 +126,7 @@ change.

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

  • multimedia (13)
    • -<<<<<<< Forcing_new_users_to_change_their_password_on_first_login.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.165
  • nuug (119)
    • @@ -278,13 +270,8 @@ 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 91c82d3aa5..6d11ce94b9 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,11 +64,7 @@ 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 @@ -182,11 +178,7 @@ 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)
    • @@ -216,13 +208,8 @@ 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 3d8715a023..85712e4ada 100644 --- a/blog/Fransk_idiotlovforslag_hinker_gjennom_parlamentet.html +++ b/blog/Fransk_idiotlovforslag_hinker_gjennom_parlamentet.html @@ -71,11 +71,7 @@ rettet mot seg.

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

  • multimedia (13)
    • -<<<<<<< Fransk_idiotlovforslag_hinker_gjennom_parlamentet.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.212
  • nuug (119)
    • @@ -223,13 +215,8 @@ 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 f6b0124e9b..fcf8a5584b 100644 --- a/blog/Free_Software_vs__proprietary_softare___.html +++ b/blog/Free_Software_vs__proprietary_softare___.html @@ -66,11 +66,7 @@ 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 @@ -184,11 +180,7 @@ 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)
    • @@ -218,13 +210,8 @@ 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 a88c0e8f5d..b7fba96948 100644 --- a/blog/Fri_og__pen_standard__slik_Digistan_ser_det.html +++ b/blog/Fri_og__pen_standard__slik_Digistan_ser_det.html @@ -107,11 +107,7 @@ produkter basert pÃ¥ standarden.

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

  • multimedia (13)
    • -<<<<<<< Fri_og__pen_standard__slik_Digistan_ser_det.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.2
  • nuug (119)
    • @@ -259,13 +251,8 @@ 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 6ce7e5b323..7281a4f069 100644 --- a/blog/Frikanalen_og_jul_i_studentr_det.html +++ b/blog/Frikanalen_og_jul_i_studentr_det.html @@ -95,11 +95,7 @@ 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 @@ -213,11 +209,7 @@ 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)
    • @@ -247,13 +239,8 @@ 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 e0bc644b8a..e18deaccab 100644 --- a/blog/Gjendikte_sangen__Copying_Is_Not_Theft__p__Norsk_.html +++ b/blog/Gjendikte_sangen__Copying_Is_Not_Theft__p__Norsk_.html @@ -121,11 +121,7 @@ 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 @@ -239,11 +235,7 @@ 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)
    • @@ -273,13 +265,8 @@ 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 2507cefc8d..fcc87c27fe 100644 --- a/blog/Gnash_buildbot_slave_and_Debian_kfreebsd.html +++ b/blog/Gnash_buildbot_slave_and_Debian_kfreebsd.html @@ -79,11 +79,7 @@ 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 @@ -197,11 +193,7 @@ 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)
    • @@ -231,13 +223,8 @@ 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 54dd8446d0..4d1ee62397 100644 --- a/blog/Gnash_enteres_Google_Summer_of_Code_2011.html +++ b/blog/Gnash_enteres_Google_Summer_of_Code_2011.html @@ -63,11 +63,7 @@ into Gnash.

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

  • multimedia (13)
    • -<<<<<<< Gnash_enteres_Google_Summer_of_Code_2011.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.26
  • nuug (119)
    • @@ -215,13 +207,8 @@ 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 f44db326a7..b4ca78c40a 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,11 +68,7 @@ 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 @@ -186,11 +182,7 @@ 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)
    • @@ -220,13 +212,8 @@ 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 7906faf911..49d74531a7 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,11 +115,7 @@ 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 @@ -233,11 +229,7 @@ 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)
    • @@ -267,13 +259,8 @@ 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 bf07b8fc83..3459a09b39 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,11 +141,7 @@ 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 @@ -259,11 +255,7 @@ 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)
    • @@ -293,13 +285,8 @@ 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 5286e4f5a2..23cdf62662 100644 --- a/blog/Hva_er_egentlig_en__pen_standard_.html +++ b/blog/Hva_er_egentlig_en__pen_standard_.html @@ -154,11 +154,7 @@ 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 @@ -272,11 +268,7 @@ 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)
    • @@ -306,13 +298,8 @@ 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 3d8300a3ea..79d7e6442d 100644 --- a/blog/Hva_har_mine_representanter_stemt_i_Storinget_.html +++ b/blog/Hva_har_mine_representanter_stemt_i_Storinget_.html @@ -129,11 +129,7 @@ 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 @@ -247,11 +243,7 @@ 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)
    • @@ -281,13 +273,8 @@ 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 1b338cd784..2e910b7c35 100644 --- a/blog/Hva_utgj_r_en_vellykket_offentlig_tjeneste_.html +++ b/blog/Hva_utgj_r_en_vellykket_offentlig_tjeneste_.html @@ -105,11 +105,7 @@ flest mulig klarer Ã¥ bidra til Ã¥ forbedre offentlig infrastruktur.

  • August (6)
    • -<<<<<<< Hva_utgj_r_en_vellykket_offentlig_tjeneste_.html
  • September (3)
    • -======= -
  • September (2)
    • ->>>>>>> 1.4 @@ -223,11 +219,7 @@ 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)
    • @@ -257,13 +249,8 @@ 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 fbc13d2206..96592ea19b 100644 --- a/blog/Hvem_stemte_hva_p__Stortinget_.html +++ b/blog/Hvem_stemte_hva_p__Stortinget_.html @@ -107,11 +107,7 @@ utviklingstimer for Ã¥ tilpasse eksisterende portal til norsk.

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

  • multimedia (13)
    • -<<<<<<< Hvem_stemte_hva_p__Stortinget_.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.2
  • nuug (119)
    • @@ -259,13 +251,8 @@ 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 06fb87a685..08219c1eba 100644 --- a/blog/Hvor_flyter_Microsofts_penger_.html +++ b/blog/Hvor_flyter_Microsofts_penger_.html @@ -81,11 +81,7 @@ om spaniaselskapet pÃ¥ spansk, men jeg kan ikke lese spansk. :(

  • August (6)
    • -<<<<<<< Hvor_flyter_Microsofts_penger_.html
  • September (3)
    • -======= -
  • September (2)
    • ->>>>>>> 1.205 @@ -199,11 +195,7 @@ 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)
    • @@ -233,13 +225,8 @@ 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 91cc8bca51..48b3f7d26c 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,11 +93,7 @@ kraftigere scanner. :)

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

  • multimedia (13)
    • -<<<<<<< Hvordan_kringkaster_T_banen_i_Oslo_sine_overv_kningskamerasignaler_.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.2
  • nuug (119)
    • @@ -245,13 +237,8 @@ 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 f2d6c2b5dd..05d09a9922 100644 --- a/blog/Hvorfor_jeg_ikke_bruker_eFaktura.html +++ b/blog/Hvorfor_jeg_ikke_bruker_eFaktura.html @@ -84,11 +84,7 @@ liker rett og slett ikke dagens faktureringsmodeller.

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

  • multimedia (13)
    • -<<<<<<< Hvorfor_jeg_ikke_bruker_eFaktura.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.206
  • nuug (119)
    • @@ -236,13 +228,8 @@ 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 0b515e9a82..a379cdde05 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,11 +64,7 @@ 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 @@ -182,11 +178,7 @@ 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)
    • @@ -216,13 +208,8 @@ 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 f456dbc324..bfaf9500cd 100644 --- a/blog/ISO_still_hope_to_fix_OOXML.html +++ b/blog/ISO_still_hope_to_fix_OOXML.html @@ -71,11 +71,7 @@ seminar this autumn.

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

  • multimedia (13)
    • -<<<<<<< ISO_still_hope_to_fix_OOXML.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.185
  • nuug (119)
    • @@ -223,13 +215,8 @@ 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 caa1f19ba6..75ce74bdc1 100644 --- a/blog/I_dag_skal_Stortinget_votere_over_datalagringsdirektivet.html +++ b/blog/I_dag_skal_Stortinget_votere_over_datalagringsdirektivet.html @@ -170,11 +170,7 @@ 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 @@ -288,11 +284,7 @@ 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)
    • @@ -322,13 +314,8 @@ 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 675c96163b..635b5bcd45 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,11 +98,7 @@ 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 @@ -216,11 +212,7 @@ 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)
    • @@ -250,13 +242,8 @@ 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 80489b78ef..b31160d176 100644 --- a/blog/Idea_for_storing_LTSP_configuration_in_LDAP.html +++ b/blog/Idea_for_storing_LTSP_configuration_in_LDAP.html @@ -130,11 +130,7 @@ personal home page over at redhat.com.

  • August (6)
    • -<<<<<<< Idea_for_storing_LTSP_configuration_in_LDAP.html
  • September (3)
    • -======= -
  • September (2)
    • ->>>>>>> 1.126 @@ -248,11 +244,7 @@ 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)
    • @@ -282,13 +274,8 @@ 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 c8abb477b6..2d0726fae2 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,11 +129,7 @@ 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 @@ -247,11 +243,7 @@ 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)
    • @@ -281,13 +273,8 @@ 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 14d98aee1d..d14169a65b 100644 --- a/blog/Inspirerende_fra_en_ukjent_Skolelinux_skole.html +++ b/blog/Inspirerende_fra_en_ukjent_Skolelinux_skole.html @@ -305,11 +305,7 @@ skoleverdagen etter Ã¥ ha jobbet med det i 10 Ã¥r.

  • August (6)
    • -<<<<<<< Inspirerende_fra_en_ukjent_Skolelinux_skole.html
  • September (3)
    • -======= -
  • September (2)
    • ->>>>>>> 1.58 @@ -423,11 +419,7 @@ 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)
    • @@ -457,13 +449,8 @@ 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 9ff48e0ca6..6c7c40b8a2 100644 --- a/blog/Intellektuelt_privilegium___et_bedre_IP_begrep.html +++ b/blog/Intellektuelt_privilegium___et_bedre_IP_begrep.html @@ -76,11 +76,7 @@ forretningshemmeligheter framover.

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

  • multimedia (13)
    • -<<<<<<< Intellektuelt_privilegium___et_bedre_IP_begrep.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.234
  • nuug (119)
    • @@ -228,13 +220,8 @@ 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 9888de8ba3..2ef037f8ac 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,11 +80,7 @@ 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 @@ -198,11 +194,7 @@ 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)
    • @@ -232,13 +224,8 @@ 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 41d88ea827..2125b9ac21 100644 --- a/blog/Internet_sensur_skal_i_retten_p__mandag.html +++ b/blog/Internet_sensur_skal_i_retten_p__mandag.html @@ -81,11 +81,7 @@ bruk av musikk.

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

  • multimedia (13)
    • -<<<<<<< Internet_sensur_skal_i_retten_p__mandag.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.2
  • nuug (119)
    • @@ -233,13 +225,8 @@ 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 06a3db5a93..e1f0605962 100644 --- a/blog/Is_Ogg_Theora_a_free_and_open_standard_.html +++ b/blog/Is_Ogg_Theora_a_free_and_open_standard_.html @@ -209,11 +209,7 @@ 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 @@ -327,11 +323,7 @@ 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)
    • @@ -361,13 +353,8 @@ 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 c32402515e..905813a98d 100644 --- a/blog/Jeg_vil_beholde_tusenlappen___jeg_bruker_den.html +++ b/blog/Jeg_vil_beholde_tusenlappen___jeg_bruker_den.html @@ -105,11 +105,7 @@ kontanter for noen dager siden.

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

  • multimedia (13)
    • -<<<<<<< Jeg_vil_beholde_tusenlappen___jeg_bruker_den.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.241
  • nuug (119)
    • @@ -257,13 +249,8 @@ 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 6bced132cb..dbc99859cc 100644 --- a/blog/Jeg_vil_ikke_ha_BankID.html +++ b/blog/Jeg_vil_ikke_ha_BankID.html @@ -139,11 +139,7 @@ nettbankkontroll over egne midler. :(
  • August (6)
    • -<<<<<<< Jeg_vil_ikke_ha_BankID.html
  • September (3)
    • -======= -
  • September (2)
    • ->>>>>>> 1.181 @@ -257,11 +253,7 @@ nettbankkontroll over egne midler. :(
  • multimedia (13)
    • -<<<<<<< Jeg_vil_ikke_ha_BankID.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.181
  • nuug (119)
    • @@ -291,13 +283,8 @@ 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 41f3f73f05..286eb79fbd 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,11 +79,7 @@ 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 @@ -197,11 +193,7 @@ 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)
    • @@ -231,13 +223,8 @@ 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 e9917175d2..21058b2da2 100644 --- a/blog/Kart_over_overv_kningskamera_i_Norge.html +++ b/blog/Kart_over_overv_kningskamera_i_Norge.html @@ -74,11 +74,7 @@ automatisk over i spesialkartet.

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

  • multimedia (13)
    • -<<<<<<< Kart_over_overv_kningskamera_i_Norge.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.2
  • nuug (119)
    • @@ -226,13 +218,8 @@ 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 72969aa802..b531558b5b 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,11 +91,7 @@ nye i stedet.

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

  • multimedia (13)
    • -<<<<<<< Kartverket__frigj_r__data_men_er_fortsatt_ikke_interessante.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.2
  • nuug (119)
    • @@ -243,13 +235,8 @@ 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 81388f7cc3..c2613581b3 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,11 +143,7 @@ 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 @@ -261,11 +257,7 @@ 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)
    • @@ -295,13 +287,8 @@ 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 f1646139a7..949719b17a 100644 --- a/blog/Kategorisering_av_problemer_p__FiksGatami.html +++ b/blog/Kategorisering_av_problemer_p__FiksGatami.html @@ -120,11 +120,7 @@ med i laget nÃ¥r det gjelder kategorisering.

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

  • multimedia (13)
    • -<<<<<<< Kategorisering_av_problemer_p__FiksGatami.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.2
  • nuug (119)
    • @@ -272,13 +264,8 @@ 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 1f14ea93cb..e6fe6ed69c 100644 --- a/blog/Kerberos_for_Debian_Edu_Squeeze_.html +++ b/blog/Kerberos_for_Debian_Edu_Squeeze_.html @@ -92,11 +92,7 @@ up in a few days.

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

  • multimedia (13)
    • -<<<<<<< Kerberos_for_Debian_Edu_Squeeze_.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.165
  • nuug (119)
    • @@ -244,13 +236,8 @@ 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/Konsekvenser_av_un_yaktige_kommunesgrenser_for_FiksGataMi.html b/blog/Konsekvenser_av_un_yaktige_kommunesgrenser_for_FiksGataMi.html index 985307d212..e496f5ce3c 100644 --- a/blog/Konsekvenser_av_un_yaktige_kommunesgrenser_for_FiksGataMi.html +++ b/blog/Konsekvenser_av_un_yaktige_kommunesgrenser_for_FiksGataMi.html @@ -89,11 +89,7 @@ fortsettelsen.

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

  • multimedia (13)
    • -<<<<<<< Konsekvenser_av_un_yaktige_kommunesgrenser_for_FiksGataMi.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.2
  • nuug (119)
    • @@ -241,13 +233,8 @@ 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 537039575c..64f90115f2 100644 --- a/blog/Korrupsjon_p__h_yeste_niv__.html +++ b/blog/Korrupsjon_p__h_yeste_niv__.html @@ -72,11 +72,7 @@ Sverige blir søndagskolefortellinger i sammenligning.

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

  • multimedia (13)
    • -<<<<<<< Korrupsjon_p__h_yeste_niv__.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.2
  • nuug (119)
    • @@ -224,13 +216,8 @@ 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 0276351173..d44d855d98 100644 --- a/blog/Kort_innspill_til_norsk_lisens_for_offentlige_data.html +++ b/blog/Kort_innspill_til_norsk_lisens_for_offentlige_data.html @@ -104,11 +104,7 @@ gjenbruk av offentlige data.

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

  • multimedia (13)
    • -<<<<<<< Kort_innspill_til_norsk_lisens_for_offentlige_data.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.30
  • nuug (119)
    • @@ -256,13 +248,8 @@ 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 792051f77e..4f62c440dc 100644 --- a/blog/Kryptert_harddisk___naturligvis.html +++ b/blog/Kryptert_harddisk___naturligvis.html @@ -85,11 +85,7 @@ betydelige.

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

  • multimedia (13)
    • -<<<<<<< Kryptert_harddisk___naturligvis.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.202
  • nuug (119)
    • @@ -237,13 +229,8 @@ 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 54001fa48a..874da85cd2 100644 --- a/blog/LUMA__a_very_nice_LDAP_GUI.html +++ b/blog/LUMA__a_very_nice_LDAP_GUI.html @@ -86,11 +86,7 @@ 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 @@ -204,11 +200,7 @@ 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)
    • @@ -238,13 +230,8 @@ 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 fb0d11adfb..8ec6b6794b 100644 --- a/blog/Lenker_samlet_2009_05_09.html +++ b/blog/Lenker_samlet_2009_05_09.html @@ -74,11 +74,7 @@ Word 2007 hÃ¥ndterer ODF dÃ¥rlig
  • August (6)
    • -<<<<<<< Lenker_samlet_2009_05_09.html
  • September (3)
    • -======= -
  • September (2)
    • ->>>>>>> 1.199 @@ -192,11 +188,7 @@ Word 2007 hÃ¥ndterer ODF dÃ¥rlig
  • multimedia (13)
    • -<<<<<<< Lenker_samlet_2009_05_09.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.199
  • nuug (119)
    • @@ -226,13 +218,8 @@ 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 ea02168234..7e9f40ee55 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,11 +269,7 @@ 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 @@ -387,11 +383,7 @@ 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)
    • @@ -421,13 +413,8 @@ 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 265ae043cc..3d5ff43d01 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,11 +148,7 @@ the difference somewhat.
  • August (6)
    • -<<<<<<< Lenny__Squeeze_upgrades__apt_vs_aptitude_with_the_Gnome_desktop.html
  • September (3)
    • -======= -
  • September (2)
    • ->>>>>>> 1.129 @@ -266,11 +262,7 @@ the difference somewhat.
  • multimedia (13)
    • -<<<<<<< Lenny__Squeeze_upgrades__apt_vs_aptitude_with_the_Gnome_desktop.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.129
  • nuug (119)
    • @@ -300,13 +292,8 @@ 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 bc4d3770ee..8f0e419b4e 100644 --- a/blog/Lenny__Squeeze_upgrades__removals_by_apt_and_aptitude.html +++ b/blog/Lenny__Squeeze_upgrades__removals_by_apt_and_aptitude.html @@ -224,11 +224,7 @@ continue.

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

  • multimedia (13)
    • -<<<<<<< Lenny__Squeeze_upgrades__removals_by_apt_and_aptitude.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.140
  • nuug (119)
    • @@ -376,13 +368,8 @@ 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 8c1e065f25..e971d6036e 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,11 +493,7 @@ 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 @@ -611,11 +607,7 @@ 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)
    • @@ -645,13 +637,8 @@ 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 9b0d2c56d2..dd139484c6 100644 --- a/blog/Links_for_2010_10_03.html +++ b/blog/Links_for_2010_10_03.html @@ -71,11 +71,7 @@ simple setup.
  • August (6)
    • -<<<<<<< Links_for_2010_10_03.html
  • September (3)
    • -======= -
  • September (2)
    • ->>>>>>> 1.95 @@ -189,11 +185,7 @@ simple setup.
  • multimedia (13)
    • -<<<<<<< Links_for_2010_10_03.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.95
  • nuug (119)
    • @@ -223,13 +215,8 @@ 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 42d93a8233..dbfa9c895c 100644 --- a/blog/Links_for_2010_10_14.html +++ b/blog/Links_for_2010_10_14.html @@ -90,11 +90,7 @@ forslag for et rent og sikkert Internet.
  • August (6)
    • -<<<<<<< Links_for_2010_10_14.html
  • September (3)
    • -======= -
  • September (2)
    • ->>>>>>> 1.93 @@ -208,11 +204,7 @@ forslag for et rent og sikkert Internet.
  • multimedia (13)
    • -<<<<<<< Links_for_2010_10_14.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.93
  • nuug (119)
    • @@ -242,13 +234,8 @@ 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 044d625b18..3df846a55a 100644 --- a/blog/Lisensvalg_for_NUUG_opptakene_endelig_p__plass.html +++ b/blog/Lisensvalg_for_NUUG_opptakene_endelig_p__plass.html @@ -65,11 +65,7 @@ i denne sammenhengen.

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

  • multimedia (13)
    • -<<<<<<< Lisensvalg_for_NUUG_opptakene_endelig_p__plass.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.2
  • nuug (119)
    • @@ -217,13 +209,8 @@ 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 99cc7029ee..aaa955e9b3 100644 --- a/blog/Litt_om_valgfusk_og_problemet_med_elektronisk_stemmegiving.html +++ b/blog/Litt_om_valgfusk_og_problemet_med_elektronisk_stemmegiving.html @@ -85,11 +85,7 @@ 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 @@ -203,11 +199,7 @@ 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)
    • @@ -237,13 +229,8 @@ 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 636ca3ffd4..a76d52442d 100644 --- a/blog/MS_Word_kr_ller_det_til_for_politiet_.html +++ b/blog/MS_Word_kr_ller_det_til_for_politiet_.html @@ -76,11 +76,7 @@ offentlig myndighet?

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

  • multimedia (13)
    • -<<<<<<< MS_Word_kr_ller_det_til_for_politiet_.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.2
  • nuug (119)
    • @@ -228,13 +220,8 @@ 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 ba707f5fa2..68ba183a82 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,11 +74,7 @@ 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 @@ -192,11 +188,7 @@ 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)
    • @@ -226,13 +218,8 @@ 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 47bd65f302..9ba38305bd 100644 --- a/blog/Magnetstripeinnhold_i_billetter_fra_Flytoget_og_Hurtigruten.html +++ b/blog/Magnetstripeinnhold_i_billetter_fra_Flytoget_og_Hurtigruten.html @@ -110,11 +110,7 @@ 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 @@ -228,11 +224,7 @@ 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)
    • @@ -262,13 +254,8 @@ 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 136b1f108e..45eaf9d946 100644 --- a/blog/Making_room_on_the_Debian_Edu_Sqeeze_DVD.html +++ b/blog/Making_room_on_the_Debian_Edu_Sqeeze_DVD.html @@ -92,11 +92,7 @@ DVD more useful again.

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

  • multimedia (13)
    • -<<<<<<< Making_room_on_the_Debian_Edu_Sqeeze_DVD.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.85
  • nuug (119)
    • @@ -244,13 +236,8 @@ 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 8a9da48efe..a6b6a3b06f 100644 --- a/blog/Martin_Bekkelund__En_stille_b_nn_om_Datalagringsdirektivet.html +++ b/blog/Martin_Bekkelund__En_stille_b_nn_om_Datalagringsdirektivet.html @@ -112,11 +112,7 @@ fÃ¥r snart se om det stemmer.

  • August (6)
    • -<<<<<<< Martin_Bekkelund__En_stille_b_nn_om_Datalagringsdirektivet.html
  • September (3)
    • -======= -
  • September (2)
    • ->>>>>>> 1.2 @@ -230,11 +226,7 @@ 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)
    • @@ -264,13 +256,8 @@ 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 b5074779f5..25dc2b043a 100644 --- a/blog/Massiv_overv_kning_av_kollektivtrafikken_i_Oslo_planlegges.html +++ b/blog/Massiv_overv_kning_av_kollektivtrafikken_i_Oslo_planlegges.html @@ -68,11 +68,7 @@ OsloomrÃ¥det.

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

  • multimedia (13)
    • -<<<<<<< Massiv_overv_kning_av_kollektivtrafikken_i_Oslo_planlegges.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.2
  • nuug (119)
    • @@ -220,13 +212,8 @@ 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 9f3ea57320..0abd7c6975 100644 --- a/blog/Masteroppgave_fra_UiO_om_RFID_sikkerhet.html +++ b/blog/Masteroppgave_fra_UiO_om_RFID_sikkerhet.html @@ -86,11 +86,7 @@ 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 @@ -204,11 +200,7 @@ 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)
    • @@ -238,13 +230,8 @@ 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 0eb86b18b1..b16f997f0a 100644 --- a/blog/Mekanikk_delen_av_reprap_byggesettet_i_hus.html +++ b/blog/Mekanikk_delen_av_reprap_byggesettet_i_hus.html @@ -73,11 +73,7 @@ og kan melde seg pÃ¥ aktive@nuug.no.

  • August (6)
    • -<<<<<<< Mekanikk_delen_av_reprap_byggesettet_i_hus.html
  • September (3)
    • -======= -
  • September (2)
    • ->>>>>>> 1.247 @@ -191,11 +187,7 @@ 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)
    • @@ -225,13 +217,8 @@ 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 846a33429f..e4a222fc17 100644 --- a/blog/Mekanikk_delen_av_reprap_byggesettet_p__vei.html +++ b/blog/Mekanikk_delen_av_reprap_byggesettet_p__vei.html @@ -65,11 +65,7 @@ bort første pakke.

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

  • multimedia (13)
    • -<<<<<<< Mekanikk_delen_av_reprap_byggesettet_p__vei.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.2
  • nuug (119)
    • @@ -217,13 +209,8 @@ 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 60ca3b709f..39649b1659 100644 --- a/blog/Mens_vi_venter_p__3D_skriveren.html +++ b/blog/Mens_vi_venter_p__3D_skriveren.html @@ -77,11 +77,7 @@ 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 @@ -195,11 +191,7 @@ 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)
    • @@ -229,13 +221,8 @@ 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 04410f5e99..5e07ad95d6 100644 --- a/blog/Mer_l_gnpropaganda_fra_BSA.html +++ b/blog/Mer_l_gnpropaganda_fra_BSA.html @@ -106,11 +106,7 @@ føre til at flere tar i bruk fri programvare.

  • August (6)
    • -<<<<<<< Mer_l_gnpropaganda_fra_BSA.html
  • September (3)
    • -======= -
  • September (2)
    • ->>>>>>> 1.2 @@ -224,11 +220,7 @@ 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)
    • @@ -258,13 +250,8 @@ 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 abfeb8a1eb..6dd376e8c1 100644 --- a/blog/Microsofts_misvisende_argumentasjon_rundt_multimediaformater.html +++ b/blog/Microsofts_misvisende_argumentasjon_rundt_multimediaformater.html @@ -97,11 +97,7 @@ misvisende pÃ¥stander etter i sømmene.

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

  • multimedia (13)
    • -<<<<<<< Microsofts_misvisende_argumentasjon_rundt_multimediaformater.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.191
  • nuug (119)
    • @@ -249,13 +241,8 @@ 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 32b5067b6f..b4430fd5f9 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,11 +128,7 @@ 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 @@ -246,11 +242,7 @@ 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)
    • @@ -280,13 +272,8 @@ 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 3db4bd9c75..3b9577adcb 100644 --- a/blog/Min_reprap_tar_sakte_form.html +++ b/blog/Min_reprap_tar_sakte_form.html @@ -87,11 +87,7 @@ arbeidet.

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

  • multimedia (13)
    • -<<<<<<< Min_reprap_tar_sakte_form.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.231
  • nuug (119)
    • @@ -239,13 +231,8 @@ 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 3858cdf7be..04d0d34863 100644 --- a/blog/More_flexible_firmware_handling_in_debian_installer.html +++ b/blog/More_flexible_firmware_handling_in_debian_installer.html @@ -97,11 +97,7 @@ contact us on debian-boot@lists.debian.org.

  • August (6)
    • -<<<<<<< More_flexible_firmware_handling_in_debian_installer.html
  • September (3)
    • -======= -
  • September (2)
    • ->>>>>>> 1.153 @@ -215,11 +211,7 @@ 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)
    • @@ -249,13 +241,8 @@ 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 2a7c3bc983..330ab244f9 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,11 +104,7 @@ 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 @@ -222,11 +218,7 @@ 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)
    • @@ -256,13 +248,8 @@ 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 a54bfb6352..bccc5f516d 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,11 +77,7 @@ 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 @@ -195,11 +191,7 @@ 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)
    • @@ -229,13 +221,8 @@ 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 a8d68ef044..54e807980b 100644 --- a/blog/Nasjonalbiblioteket_legger_ut_b_ker_p__web.html +++ b/blog/Nasjonalbiblioteket_legger_ut_b_ker_p__web.html @@ -82,11 +82,7 @@ fortløpende.

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

  • multimedia (13)
    • -<<<<<<< Nasjonalbiblioteket_legger_ut_b_ker_p__web.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.2
  • nuug (119)
    • @@ -234,13 +226,8 @@ 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 24fb136d76..daa50ec4e0 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,11 +77,7 @@ 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 @@ -195,11 +191,7 @@ 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)
    • @@ -229,13 +221,8 @@ 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 af33bf0ad0..11c51dab12 100644 --- a/blog/No_hardcoded_config_on_Debian_Edu_clients.html +++ b/blog/No_hardcoded_config_on_Debian_Edu_clients.html @@ -172,11 +172,7 @@ implement it for Debian Edu. :)

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

  • multimedia (13)
    • -<<<<<<< No_hardcoded_config_on_Debian_Edu_clients.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.115
  • nuug (119)
    • @@ -324,13 +316,8 @@ 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 4876af4889..f01334ada7 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,11 +63,7 @@ properties.

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

  • multimedia (13)
    • -<<<<<<< No_patch_is_not_better_than_a_useless_patch.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.203
  • nuug (119)
    • @@ -215,13 +207,8 @@ 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 bc505e95bd..49a7f9acf5 100644 --- a/blog/Noen_lenker_om_Datalagringsdirektivet.html +++ b/blog/Noen_lenker_om_Datalagringsdirektivet.html @@ -135,11 +135,7 @@ mer.

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

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

  • surveillance (9)
    • -<<<<<<< Noen_lenker_om_Datalagringsdirektivet.html
  • valg (6)
    • -======= -
  • valg (5)
    • - ->>>>>>> 1.52
  • video (20)
  • vitenskap (1)
    • diff --git a/blog/Noen_problemer_rundt_unikt_nummererte_stemmesedler_i_norske_valg.html b/blog/Noen_problemer_rundt_unikt_nummererte_stemmesedler_i_norske_valg.html index 853ced82b1..7233634a36 100644 --- a/blog/Noen_problemer_rundt_unikt_nummererte_stemmesedler_i_norske_valg.html +++ b/blog/Noen_problemer_rundt_unikt_nummererte_stemmesedler_i_norske_valg.html @@ -110,7 +110,7 @@ programvare, og tilgjengelig fra
  • August (6)
    • -
  • September (2)
    • +
  • September (3)
    • @@ -224,7 +224,7 @@ programvare, og tilgjengelig fra
  • multimedia (13)
    • -
  • norsk (136)
    • +
  • norsk (137)
  • nuug (119)
    • @@ -254,7 +254,7 @@ programvare, og tilgjengelig fra
  • surveillance (9)
    • -
  • valg (5)
    • +
  • valg (6)
  • video (20)
    • diff --git a/blog/Norge_trenger_en_personvernforening.html b/blog/Norge_trenger_en_personvernforening.html index eb8038cd7f..41ab35a0ef 100644 --- a/blog/Norge_trenger_en_personvernforening.html +++ b/blog/Norge_trenger_en_personvernforening.html @@ -69,11 +69,7 @@ nÃ¥ fÃ¥r vi se om noen er enig.

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

  • multimedia (13)
    • -<<<<<<< Norge_trenger_en_personvernforening.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.232
  • nuug (119)
    • @@ -221,13 +213,8 @@ 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 8431f1a122..dec9f13740 100644 --- a/blog/Norgeskartet_p__mange_vis___via_OpenStreetmap_org.html +++ b/blog/Norgeskartet_p__mange_vis___via_OpenStreetmap_org.html @@ -85,11 +85,7 @@ dermed være noe for enhver smak.

  • August (6)
    • -<<<<<<< Norgeskartet_p__mange_vis___via_OpenStreetmap_org.html
  • September (3)
    • -======= -
  • September (2)
    • ->>>>>>> 1.2 @@ -203,11 +199,7 @@ 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)
    • @@ -237,13 +229,8 @@ 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 09d871239e..2d9eaaff5b 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,11 +98,7 @@ donations to the address
  • August (6)
    • -<<<<<<< Now_accepting_bitcoins___anonymous_and_distributed_p2p_crypto_money.html
  • September (3)
    • -======= -
  • September (2)
    • ->>>>>>> 1.69 @@ -216,11 +212,7 @@ donations to the address
  • multimedia (13)
    • -<<<<<<< Now_accepting_bitcoins___anonymous_and_distributed_p2p_crypto_money.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.69
  • nuug (119)
    • @@ -250,13 +242,8 @@ 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 41c0a70881..c5a67fae87 100644 --- a/blog/ODF_bruk_i_staten__ikke_helt_p__plass.html +++ b/blog/ODF_bruk_i_staten__ikke_helt_p__plass.html @@ -69,11 +69,7 @@ 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 @@ -187,11 +183,7 @@ 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)
    • @@ -221,13 +213,8 @@ 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 c8df380542..6019279727 100644 --- a/blog/Officeshots_still_going_strong.html +++ b/blog/Officeshots_still_going_strong.html @@ -69,11 +69,7 @@ got such a great test tool available.

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

  • multimedia (13)
    • -<<<<<<< Officeshots_still_going_strong.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.63
  • nuug (119)
    • @@ -221,13 +213,8 @@ 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 f5ce96b229..ce7d9a13a0 100644 --- a/blog/Officeshots_taking_shape.html +++ b/blog/Officeshots_taking_shape.html @@ -78,11 +78,7 @@ Windows. This is great.

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

  • multimedia (13)
    • -<<<<<<< Officeshots_taking_shape.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.137
  • nuug (119)
    • @@ -230,13 +222,8 @@ 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 e851082d10..1cb87c9740 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,11 +91,7 @@ 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 @@ -209,11 +205,7 @@ 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)
    • @@ -243,13 +235,8 @@ 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 c8cad6b9ef..414999d00d 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,11 +72,7 @@ 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 @@ -190,11 +186,7 @@ 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)
    • @@ -224,13 +216,8 @@ 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 356a371165..5b97efec31 100644 --- a/blog/Oppdatert_kart_over_overv_kningskamera_i_Norge.html +++ b/blog/Oppdatert_kart_over_overv_kningskamera_i_Norge.html @@ -71,11 +71,7 @@ OSM-dumpen for Norge.

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

  • multimedia (13)
    • -<<<<<<< Oppdatert_kart_over_overv_kningskamera_i_Norge.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.2
  • nuug (119)
    • @@ -223,13 +215,8 @@ 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 a546527cae..7ac9ffe844 100644 --- a/blog/Opphavet_til_Skolelinux_prosjektet.html +++ b/blog/Opphavet_til_Skolelinux_prosjektet.html @@ -84,11 +84,7 @@ Resten er historie. :)

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

  • multimedia (13)
    • -<<<<<<< Opphavet_til_Skolelinux_prosjektet.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.175
  • nuug (119)
    • @@ -236,13 +228,8 @@ 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 d21b0d40fb..9a33079647 100644 --- a/blog/Overv_kningslogikkens_fallitt.html +++ b/blog/Overv_kningslogikkens_fallitt.html @@ -83,11 +83,7 @@ jeg tror bidrar til Ã¥ holde ekstreme holdninger i sjakk.

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

  • multimedia (13)
    • -<<<<<<< Overv_kningslogikkens_fallitt.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.2
  • nuug (119)
    • @@ -235,13 +227,8 @@ 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 64baaac62c..91d7d33caa 100644 --- a/blog/P__vegne_av_vanvitting_mange__Aftenposten_.html +++ b/blog/P__vegne_av_vanvitting_mange__Aftenposten_.html @@ -66,11 +66,7 @@ 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 @@ -184,11 +180,7 @@ 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)
    • @@ -218,13 +210,8 @@ 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 3d626762fc..e2462c1c0a 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,11 +82,7 @@ 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 @@ -200,11 +196,7 @@ 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)
    • @@ -234,13 +226,8 @@ 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 cecd174c8e..4c934b52f8 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,11 +95,7 @@ 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 @@ -213,11 +209,7 @@ 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)
    • @@ -247,13 +239,8 @@ 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 cfed73793a..229f2840b3 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,11 +91,7 @@ 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 @@ -209,11 +205,7 @@ 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)
    • @@ -243,13 +235,8 @@ 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 ec321ae1f8..df81e4cfe7 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,11 +80,7 @@ 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 @@ -198,11 +194,7 @@ 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)
    • @@ -232,13 +224,8 @@ 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 03dfc6c725..434ae1ece7 100644 --- a/blog/Pieces_of_the_roaming_laptop_puzzle_in_Debian.html +++ b/blog/Pieces_of_the_roaming_laptop_puzzle_in_Debian.html @@ -107,11 +107,7 @@ 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 @@ -225,11 +221,7 @@ 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)
    • @@ -259,13 +251,8 @@ 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 cbacfd9d35..b23dc4f602 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,11 +98,7 @@ 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 @@ -216,11 +212,7 @@ 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)
    • @@ -250,13 +242,8 @@ 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 b1897d0a02..456e647b01 100644 --- a/blog/Pornoskannerne_p__flyplassene_bedrer_visst_ikke_sikkerheten.html +++ b/blog/Pornoskannerne_p__flyplassene_bedrer_visst_ikke_sikkerheten.html @@ -74,11 +74,7 @@ kan.

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

  • multimedia (13)
    • -<<<<<<< Pornoskannerne_p__flyplassene_bedrer_visst_ikke_sikkerheten.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.2
  • nuug (119)
    • @@ -226,13 +218,8 @@ 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 6118572fb4..18989a8bd9 100644 --- a/blog/Radiomerking_med_RFID.html +++ b/blog/Radiomerking_med_RFID.html @@ -105,11 +105,7 @@ mer om de nye biometriske passene.

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

  • multimedia (13)
    • -<<<<<<< Radiomerking_med_RFID.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.46
  • nuug (119)
    • @@ -257,13 +249,8 @@ 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 005f04e71a..d65279c23a 100644 --- a/blog/Recording_video_from_cron_using_VLC.html +++ b/blog/Recording_video_from_cron_using_VLC.html @@ -93,11 +93,7 @@ wait $pid
  • August (6)
    • -<<<<<<< Recording_video_from_cron_using_VLC.html
  • September (3)
    • -======= -
  • September (2)
    • ->>>>>>> 1.213 @@ -211,11 +207,7 @@ wait $pid
  • multimedia (13)
    • -<<<<<<< Recording_video_from_cron_using_VLC.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.213
  • nuug (119)
    • @@ -245,13 +237,8 @@ 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 d6e1857e6c..7c058b6f13 100644 --- a/blog/Regjeringen_vil_gj_re_offentlighetsloven_mer_tannl_s.html +++ b/blog/Regjeringen_vil_gj_re_offentlighetsloven_mer_tannl_s.html @@ -74,11 +74,7 @@ offentlige bør skrinlegges.

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

  • multimedia (13)
    • -<<<<<<< Regjeringen_vil_gj_re_offentlighetsloven_mer_tannl_s.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.2
  • nuug (119)
    • @@ -226,13 +218,8 @@ 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 8713604883..29d503168c 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,11 +85,7 @@ 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 @@ -203,11 +199,7 @@ 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)
    • @@ -237,13 +229,8 @@ 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 cfea3ada1b..800724d999 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,11 +76,7 @@ politidirektoratet om patentproblemer i Theora).

  • August (6)
    • -<<<<<<< Regjerningens_oppsummering_av_h_ringen_om_standardkatalogen_versjon_2.html
  • September (3)
    • -======= -
  • September (2)
    • ->>>>>>> 1.2 @@ -194,11 +190,7 @@ 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)
    • @@ -228,13 +220,8 @@ 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 f875ff900d..58918a09a0 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,11 +105,7 @@ numbers.

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

  • multimedia (13)
    • -<<<<<<< Relative_popularity_of_document_formats__MS_Office_vs__ODF_.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.184
  • nuug (119)
    • @@ -257,13 +249,8 @@ 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 f3831d119c..afd60dfa2e 100644 --- a/blog/Reprap_bygging_i_p_sken.html +++ b/blog/Reprap_bygging_i_p_sken.html @@ -109,11 +109,7 @@ kommer til Ã¥ bruke denne plasttypen som hÃ¥ndterer temperaturer mellom
  • August (6)
    • -<<<<<<< Reprap_bygging_i_p_sken.html
  • September (3)
    • -======= -
  • September (2)
    • ->>>>>>> 1.2 @@ -227,11 +223,7 @@ 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)
    • @@ -261,13 +253,8 @@ 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 cbf9e92cf4..ff85eb33c8 100644 --- a/blog/Reprap_pakke_tapt_i_posten.html +++ b/blog/Reprap_pakke_tapt_i_posten.html @@ -65,11 +65,7 @@ lenge alt er klart til Go Open
  • August (6)
    • -<<<<<<< Reprap_pakke_tapt_i_posten.html
  • September (3)
    • -======= -
  • September (2)
    • ->>>>>>> 1.250 @@ -183,11 +179,7 @@ lenge alt er klart til Go Open
  • multimedia (13)
    • -<<<<<<< Reprap_pakke_tapt_i_posten.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.250
  • nuug (119)
    • @@ -217,13 +209,8 @@ 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 673ef79ba5..f097e5d724 100644 --- a/blog/Returning_from_Skolelinux_developer_gathering.html +++ b/blog/Returning_from_Skolelinux_developer_gathering.html @@ -71,11 +71,7 @@ now. :)

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

  • multimedia (13)
    • -<<<<<<< Returning_from_Skolelinux_developer_gathering.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.215
  • nuug (119)
    • @@ -223,13 +215,8 @@ 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 5faa96773a..da2556cb31 100644 --- a/blog/Rob_Weir__How_to_Crush_Dissent.html +++ b/blog/Rob_Weir__How_to_Crush_Dissent.html @@ -62,11 +62,7 @@ long time.

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

  • multimedia (13)
    • -<<<<<<< Rob_Weir__How_to_Crush_Dissent.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.113
  • nuug (119)
    • @@ -214,13 +206,8 @@ 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 747f65297f..a14003a834 100644 --- a/blog/Robot__reis_deg___.html +++ b/blog/Robot__reis_deg___.html @@ -94,11 +94,7 @@ der hvis du er nysgjerrig.

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

  • multimedia (13)
    • -<<<<<<< Robot__reis_deg___.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.111
  • nuug (119)
    • @@ -246,13 +238,8 @@ 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 afe6ebee8a..d2b0fb4f08 100644 --- a/blog/Sikkerhet__teater__og_hvordan_gj_re_verden_sikrere.html +++ b/blog/Sikkerhet__teater__og_hvordan_gj_re_verden_sikrere.html @@ -67,11 +67,7 @@ pÃ¥ flyplassene.

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

  • multimedia (13)
    • -<<<<<<< Sikkerhet__teater__og_hvordan_gj_re_verden_sikrere.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.2
  • nuug (119)
    • @@ -219,13 +211,8 @@ 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 23709211b7..fbe0b8e202 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,11 +109,7 @@ 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 @@ -227,11 +223,7 @@ 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)
    • @@ -261,13 +253,8 @@ 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 91de386e0a..1b6e6bcc57 100644 --- a/blog/Sikkerhetsteateret_p__flyplassene_fortsetter.html +++ b/blog/Sikkerhetsteateret_p__flyplassene_fortsetter.html @@ -85,11 +85,7 @@ 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 @@ -203,11 +199,7 @@ 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)
    • @@ -237,13 +229,8 @@ 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 1fa0ec23cf..3e086ee208 100644 --- a/blog/Sitesummary_tip__Listing_MAC_address_of_all_clients.html +++ b/blog/Sitesummary_tip__Listing_MAC_address_of_all_clients.html @@ -81,11 +81,7 @@ written yet.

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

  • multimedia (13)
    • -<<<<<<< Sitesummary_tip__Listing_MAC_address_of_all_clients.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.157
  • nuug (119)
    • @@ -233,13 +225,8 @@ 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 cb72f0459f..cd01c12e2d 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,11 +88,7 @@ collector.

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

  • multimedia (13)
    • -<<<<<<< Sitesummary_tip__Listing_computer_hardware_models_used_at_site.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.147
  • nuug (119)
    • @@ -240,13 +232,8 @@ 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 694f07a968..f8898939c4 100644 --- a/blog/Skolelinux_er_laget_for_sentraldrifting__naturligvis.html +++ b/blog/Skolelinux_er_laget_for_sentraldrifting__naturligvis.html @@ -133,11 +133,7 @@ minner.

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

  • multimedia (13)
    • -<<<<<<< Skolelinux_er_laget_for_sentraldrifting__naturligvis.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.146
  • nuug (119)
    • @@ -285,13 +277,8 @@ 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 a7b9dac196..87f248b6c1 100644 --- a/blog/Skolelinux_i_Osloskolen.html +++ b/blog/Skolelinux_i_Osloskolen.html @@ -75,11 +75,7 @@ brukerprogrammene som er tilgjengelig i Skolelinux.

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

  • multimedia (13)
    • -<<<<<<< Skolelinux_i_Osloskolen.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.108
  • nuug (119)
    • @@ -227,13 +219,8 @@ 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 0168714933..0fb2599c51 100644 --- a/blog/Skolelinux_intervju__Arnt_Ove_Gregersen.html +++ b/blog/Skolelinux_intervju__Arnt_Ove_Gregersen.html @@ -134,11 +134,7 @@ 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 @@ -252,11 +248,7 @@ 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)
    • @@ -286,13 +278,8 @@ 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 f0e753c691..3755d7214e 100644 --- a/blog/Skolelinux_intervju__Astri_Sletteng.html +++ b/blog/Skolelinux_intervju__Astri_Sletteng.html @@ -121,11 +121,7 @@ er en god strategi Ã¥ bruke.

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

  • multimedia (13)
    • -<<<<<<< Skolelinux_intervju__Astri_Sletteng.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.34
  • nuug (119)
    • @@ -273,13 +265,8 @@ 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 dab9de20bb..d2db83e550 100644 --- a/blog/Skolelinux_intervju__Embrik_Kaslegard.html +++ b/blog/Skolelinux_intervju__Embrik_Kaslegard.html @@ -147,11 +147,7 @@ spørsmÃ¥lene litt mer tekst fra Embrik.

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

  • multimedia (13)
    • -<<<<<<< Skolelinux_intervju__Embrik_Kaslegard.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.46
  • nuug (119)
    • @@ -299,13 +291,8 @@ 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 45a10b51bd..3756bcd396 100644 --- a/blog/Skolelinux_intervju__Frode_Jemtland.html +++ b/blog/Skolelinux_intervju__Frode_Jemtland.html @@ -171,11 +171,7 @@ sidelinjen.

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

  • multimedia (13)
    • -<<<<<<< Skolelinux_intervju__Frode_Jemtland.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.12
  • nuug (119)
    • @@ -323,13 +315,8 @@ 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 c137b41e8a..47260dc030 100644 --- a/blog/Skolelinux_intervju__Marius_Kotsbak.html +++ b/blog/Skolelinux_intervju__Marius_Kotsbak.html @@ -118,11 +118,7 @@ av.

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

  • multimedia (13)
    • -<<<<<<< Skolelinux_intervju__Marius_Kotsbak.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.26
  • nuug (119)
    • @@ -270,13 +262,8 @@ 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 4dd0d8b82e..362bd36540 100644 --- a/blog/Skolelinux_intervju__Morten_Amundsen.html +++ b/blog/Skolelinux_intervju__Morten_Amundsen.html @@ -116,11 +116,7 @@ fÃ¥ mest mulig læring for pengene man har.

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

  • multimedia (13)
    • -<<<<<<< Skolelinux_intervju__Morten_Amundsen.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.41
  • nuug (119)
    • @@ -268,13 +260,8 @@ 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 975cff340a..32cb9f45ef 100644 --- a/blog/Skolelinux_intervju__Odin_Hetland_N_sen.html +++ b/blog/Skolelinux_intervju__Odin_Hetland_N_sen.html @@ -194,11 +194,7 @@ 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 @@ -312,11 +308,7 @@ 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)
    • @@ -346,13 +338,8 @@ 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 a6146241f6..6130460896 100644 --- a/blog/Skolelinux_intervju__Rub_n_Romero_y_Cordero.html +++ b/blog/Skolelinux_intervju__Rub_n_Romero_y_Cordero.html @@ -140,11 +140,7 @@ opplysning, kunnskap og kompetanse.

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

  • multimedia (13)
    • -<<<<<<< Skolelinux_intervju__Rub_n_Romero_y_Cordero.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.2
  • nuug (119)
    • @@ -292,13 +284,8 @@ 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 d1f0f5c648..a9c743098d 100644 --- a/blog/Skolelinux_intervju__Sturle_Sunde.html +++ b/blog/Skolelinux_intervju__Sturle_Sunde.html @@ -180,11 +180,7 @@ Det er eit godt produkt, brukt av mange og godt likt.»

  • August (6)
    • -<<<<<<< Skolelinux_intervju__Sturle_Sunde.html
  • September (3)
    • -======= -
  • September (2)
    • ->>>>>>> 1.44 @@ -298,11 +294,7 @@ 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)
    • @@ -332,13 +324,8 @@ 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 dbcecd6a19..dfc905987e 100644 --- a/blog/Skolelinux_intervju__Viggo_Fedreheim.html +++ b/blog/Skolelinux_intervju__Viggo_Fedreheim.html @@ -119,11 +119,7 @@ servere.

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

  • multimedia (13)
    • -<<<<<<< Skolelinux_intervju__Viggo_Fedreheim.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.50
  • nuug (119)
    • @@ -271,13 +263,8 @@ 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 0801060804..22523d75a5 100644 --- a/blog/Software_updates_2010_10_24.html +++ b/blog/Software_updates_2010_10_24.html @@ -86,11 +86,7 @@ clients to get a Linux desktop on request.

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

  • multimedia (13)
    • -<<<<<<< Software_updates_2010_10_24.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.88
  • nuug (119)
    • @@ -238,13 +230,8 @@ 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 6e9cbc4f47..bd95169c9f 100644 --- a/blog/Software_video_mixer_on_a_USB_stick.html +++ b/blog/Software_video_mixer_on_a_USB_stick.html @@ -80,11 +80,7 @@ larger stick as well.

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

  • multimedia (13)
    • -<<<<<<< Software_video_mixer_on_a_USB_stick.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.243
  • nuug (119)
    • @@ -232,13 +224,8 @@ 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 50fcc176cb..a77798ffa2 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,11 +96,7 @@ accept the new package into Squeeze.

  • August (6)
    • -<<<<<<< Some_notes_on_Flash_in_Debian_and_Debian_Edu.html
  • September (3)
    • -======= -
  • September (2)
    • ->>>>>>> 1.104 @@ -214,11 +210,7 @@ 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)
    • @@ -248,13 +240,8 @@ 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 2786467b63..ecbe657edd 100644 --- a/blog/Some_thoughts_on_BitCoins.html +++ b/blog/Some_thoughts_on_BitCoins.html @@ -132,11 +132,7 @@ 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 @@ -250,11 +246,7 @@ 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)
    • @@ -284,13 +276,8 @@ 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 00079f6292..fd97e62fda 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,11 +68,7 @@ langt.

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

  • multimedia (13)
    • -<<<<<<< St_tte_for_forskjellige_kamera_ikoner_p__overv_kningskamerakartet.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.2
  • nuug (119)
    • @@ -220,13 +212,8 @@ 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 3bd63bd91c..d8e0c0a8c8 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,11 +69,7 @@ bidrar positivt.

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

  • multimedia (13)
    • -<<<<<<< Standarder_fungerer_best_n_r_en_samler_seg_rundt_dem.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.2
  • nuug (119)
    • @@ -221,13 +213,8 @@ 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 c9abe84c44..ce7478e758 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,11 +81,7 @@ 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 @@ -199,11 +195,7 @@ 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)
    • @@ -233,13 +225,8 @@ 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 a3dfa43e31..989e3c6ca4 100644 --- a/blog/Standardkrav_inn_i_anbudstekster_.html +++ b/blog/Standardkrav_inn_i_anbudstekster_.html @@ -124,11 +124,7 @@ skal spesifisere hvordan seriell-konsoll skal fungere.

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

  • multimedia (13)
    • -<<<<<<< Standardkrav_inn_i_anbudstekster_.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.90
  • nuug (119)
    • @@ -276,13 +268,8 @@ 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 389f7a4b87..7be94dcb99 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,11 +75,7 @@ very cool 3D scanner.

  • August (6)
    • -<<<<<<< Student_group_continue_the_work_on_my_Reprap_3D_printer.html
  • September (3)
    • -======= -
  • September (2)
    • ->>>>>>> 1.71 @@ -193,11 +189,7 @@ 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)
    • @@ -227,13 +219,8 @@ 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 56ab94bc17..a79354328d 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,11 +83,7 @@ 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 @@ -201,11 +197,7 @@ 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)
    • @@ -235,13 +227,8 @@ 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 a0e2cc8693..22eb942c02 100644 --- a/blog/Taking_over_sysvinit_development.html +++ b/blog/Taking_over_sysvinit_development.html @@ -78,11 +78,7 @@ distributions are moving to upstart as a syvinit replacement.

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

  • multimedia (13)
    • -<<<<<<< Taking_over_sysvinit_development.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.187
  • nuug (119)
    • @@ -230,13 +222,8 @@ 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 ebe474b01e..2947ad65a6 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,11 +84,7 @@ stort.

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

  • multimedia (13)
    • -<<<<<<< Teknisk_program_for_Go_Open_2009_er_nesten_ferdig.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.225
  • nuug (119)
    • @@ -236,13 +228,8 @@ 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 2da0251c33..b2e907943e 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,11 +96,7 @@ 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 @@ -214,11 +210,7 @@ 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)
    • @@ -248,13 +240,8 @@ 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 ec44f1dc2e..59c625da15 100644 --- a/blog/Tester_blog.html +++ b/blog/Tester_blog.html @@ -59,11 +59,7 @@ forsøk.

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

  • multimedia (13)
    • -<<<<<<< Tester_blog.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.257
  • nuug (119)
    • @@ -211,13 +203,8 @@ 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 88cf5d8559..3dbd039b67 100644 --- a/blog/Testing_av_reprap_elektronikken_igang.html +++ b/blog/Testing_av_reprap_elektronikken_igang.html @@ -87,11 +87,7 @@ reprap-en kvikner til.

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

  • multimedia (13)
    • -<<<<<<< Testing_av_reprap_elektronikken_igang.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.221
  • nuug (119)
    • @@ -239,13 +231,8 @@ 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 ff19901413..7a0f3b3a68 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,11 +279,7 @@ 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 @@ -397,11 +393,7 @@ 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)
    • @@ -431,13 +423,8 @@ 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 accef6cc5b..56d5244754 100644 --- a/blog/The_many_definitions_of_a_open_standard.html +++ b/blog/The_many_definitions_of_a_open_standard.html @@ -274,11 +274,7 @@ Standards.

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

  • multimedia (13)
    • -<<<<<<< The_many_definitions_of_a_open_standard.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.62
  • nuug (119)
    • @@ -426,13 +418,8 @@ 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 ac2531e679..1f1ea736fb 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,11 +252,7 @@ Congressman of the Republic of Perú.

  • August (6)
    • -<<<<<<< The_reply_from_Edgar_Villanueva_to_Microsoft_in_Peru.html
  • September (3)
    • -======= -
  • September (2)
    • ->>>>>>> 1.63 @@ -370,11 +366,7 @@ 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)
    • @@ -404,13 +396,8 @@ 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 1218f663f1..83ea9f9b23 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,11 +74,7 @@ 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 @@ -192,11 +188,7 @@ 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)
    • @@ -226,13 +218,8 @@ 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 ac45e0e133..b4d32b8544 100644 --- a/blog/The_video_format_most_supported_in_web_browsers_.html +++ b/blog/The_video_format_most_supported_in_web_browsers_.html @@ -104,11 +104,7 @@ 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 @@ -222,11 +218,7 @@ 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)
    • @@ -256,13 +248,8 @@ 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 fadaa740f3..b147915500 100644 --- a/blog/Thoughts_on_roaming_laptop_setup_for_Debian_Edu.html +++ b/blog/Thoughts_on_roaming_laptop_setup_for_Debian_Edu.html @@ -121,11 +121,7 @@ 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 @@ -239,11 +235,7 @@ 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)
    • @@ -273,13 +265,8 @@ 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 623be45a31..acf885243d 100644 --- a/blog/Time_for_new__LDAP_schemas_replacing_RFC_2307_.html +++ b/blog/Time_for_new__LDAP_schemas_replacing_RFC_2307_.html @@ -88,11 +88,7 @@ new IETF work group?

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

  • multimedia (13)
    • -<<<<<<< Time_for_new__LDAP_schemas_replacing_RFC_2307_.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.215
  • nuug (119)
    • @@ -240,13 +232,8 @@ 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 dc8f0fd0df..df7d36bb86 100644 --- a/blog/Togsatsing_p__norsk__mot_sykkel.html +++ b/blog/Togsatsing_p__norsk__mot_sykkel.html @@ -63,11 +63,7 @@ effekt pÃ¥ omrÃ¥det der?

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

  • multimedia (13)
    • -<<<<<<< Togsatsing_p__norsk__mot_sykkel.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.2
  • nuug (119)
    • @@ -215,13 +207,8 @@ 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 489982389c..7327d4aa6e 100644 --- a/blog/Transendentalt_tullball_og_en_funksjonell_tiln_rming.html +++ b/blog/Transendentalt_tullball_og_en_funksjonell_tiln_rming.html @@ -75,11 +75,7 @@ oppløsning.

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

  • multimedia (13)
    • -<<<<<<< Transendentalt_tullball_og_en_funksjonell_tiln_rming.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.2
  • nuug (119)
    • @@ -227,13 +219,8 @@ 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 eedc8cd8bc..b705c166b3 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,11 +92,7 @@ surrounded by today.

  • August (6)
    • -<<<<<<< Two_projects_that_have_improved_the_quality_of_free_software_a_lot.html
  • September (3)
    • -======= -
  • September (2)
    • ->>>>>>> 1.202 @@ -210,11 +206,7 @@ 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)
    • @@ -244,13 +236,8 @@ 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 abe206494d..091099f6ad 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,11 +97,7 @@ choice.

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

  • multimedia (13)
    • -<<<<<<< Upstart_or_sysvinit___as_init_d_scripts_see_it.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.146
  • nuug (119)
    • @@ -249,13 +241,8 @@ 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 0086809026..bb6d47e860 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,11 +126,7 @@ for their packages.

  • August (6)
    • -<<<<<<< Using_NVD_and_CPE_to_track_CVEs_in_locally_maintained_software.html
  • September (3)
    • -======= -
  • September (2)
    • ->>>>>>> 1.41 @@ -244,11 +240,7 @@ 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)
    • @@ -278,13 +270,8 @@ 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 ae509eb2d9..3e9dfe75c5 100644 --- a/blog/Using_bar_codes_at_a_computing_center.html +++ b/blog/Using_bar_codes_at_a_computing_center.html @@ -97,11 +97,7 @@ easier automatic tracking of computers.

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

  • multimedia (13)
    • -<<<<<<< Using_bar_codes_at_a_computing_center.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.227
  • nuug (119)
    • @@ -249,13 +241,8 @@ 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 391b379988..acd5dcd235 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,11 +90,7 @@ hÃ¥ndheves strengt.

  • August (6)
    • -<<<<<<< Vinmonopolet_bryter_loven__penlyst___og_flere_planlegger___gj_re_det_samme.html
  • September (3)
    • -======= -
  • September (2)
    • ->>>>>>> 1.2 @@ -208,11 +204,7 @@ 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)
    • @@ -242,13 +234,8 @@ 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 988fb9364e..47233e7581 100644 --- a/blog/Vitenskapens_dogmer___.html +++ b/blog/Vitenskapens_dogmer___.html @@ -124,11 +124,7 @@ skyskrapere. Takke meg til en tur til mÃ¥nen.

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

  • multimedia (13)
    • -<<<<<<< Vitenskapens_dogmer___.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.217
  • nuug (119)
    • @@ -276,13 +268,8 @@ 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 f1af0296aa..e4c75105e1 100644 --- a/blog/Voteringsdata_fra_stortinget_p__plass__mye_igjen.html +++ b/blog/Voteringsdata_fra_stortinget_p__plass__mye_igjen.html @@ -90,11 +90,7 @@ utviklingstimer for Ã¥ en norsk portal pÃ¥ plass.

  • August (6)
    • -<<<<<<< Voteringsdata_fra_stortinget_p__plass__mye_igjen.html
  • September (3)
    • -======= -
  • September (2)
    • ->>>>>>> 1.2 @@ -208,11 +204,7 @@ 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)
    • @@ -242,13 +234,8 @@ 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 8f7b23eef2..c62295f11c 100644 --- a/blog/Webbasert_tegneseriearkiv_p__trappene.html +++ b/blog/Webbasert_tegneseriearkiv_p__trappene.html @@ -101,11 +101,7 @@ titt.

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

  • multimedia (13)
    • -<<<<<<< Webbasert_tegneseriearkiv_p__trappene.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.2
  • nuug (119)
    • @@ -253,13 +245,8 @@ 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 47f7234661..981df923ad 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,11 +367,7 @@ auxiliary object class.

  • August (6)
    • -<<<<<<< What_are_they_searching_for___PowerDNS_and_ISC_DHCP_in_LDAP.html
  • September (3)
    • -======= -
  • September (2)
    • ->>>>>>> 1.125 @@ -485,11 +481,7 @@ 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)
    • @@ -519,13 +511,8 @@ 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 da96989813..ce8bb07ddf 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,11 +118,7 @@ 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 @@ -236,11 +232,7 @@ 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)
    • @@ -270,13 +262,8 @@ 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 8bd68d160e..9e411a2057 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,11 +99,7 @@ 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 @@ -217,11 +213,7 @@ 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)
    • @@ -251,13 +243,8 @@ 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 93fa19bae0..b75675748d 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,11 +77,7 @@ 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 @@ -195,11 +191,7 @@ 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)
    • @@ -229,13 +221,8 @@ 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 1fa45e0d2d..dd4ca96305 100644 --- a/blog/When_web_browser_developers_make_a_video_player___.html +++ b/blog/When_web_browser_developers_make_a_video_player___.html @@ -98,11 +98,7 @@ 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 @@ -216,11 +212,7 @@ 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)
    • @@ -250,13 +242,8 @@ 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 e993f1a28e..15b14b6f1d 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,11 +132,7 @@ well.

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

  • multimedia (13)
    • -<<<<<<< Which_module_is_loaded_for_a_given_PCI_and_USB_device_.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.43
  • nuug (119)
    • @@ -284,13 +276,8 @@ 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 e17910e1be..b203818187 100644 --- a/blog/Why_isn_t_Debian_Edu_using_VLC_.html +++ b/blog/Why_isn_t_Debian_Edu_using_VLC_.html @@ -87,11 +87,7 @@ what is going on.

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

  • multimedia (13)
    • -<<<<<<< Why_isn_t_Debian_Edu_using_VLC_.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.73
  • nuug (119)
    • @@ -239,13 +231,8 @@ 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 4dd0e404d4..351455c0ed 100644 --- a/blog/_pne_tr_dl_snett_er_et_samfunnsgode.html +++ b/blog/_pne_tr_dl_snett_er_et_samfunnsgode.html @@ -76,11 +76,7 @@ anstrenge oss for Ã¥ beholde.

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

  • multimedia (13)
    • -<<<<<<< _pne_tr_dl_snett_er_et_samfunnsgode.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.2
  • nuug (119)
    • @@ -228,13 +220,8 @@ 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 382a21f3a6..cf968ba027 100644 --- a/blog/archive/2008/11/index.html +++ b/blog/archive/2008/11/index.html @@ -208,11 +208,7 @@ lenge alt er klart til Go Open
  • August (6)
    • -<<<<<<< index.html
  • September (3)
    • -======= -
  • September (2)
    • ->>>>>>> 1.261 @@ -326,11 +322,7 @@ lenge alt er klart til Go Open
  • multimedia (13)
    • -<<<<<<< index.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.261
  • nuug (119)
    • @@ -360,13 +352,8 @@ 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 01ab5595e5..44ee4f54cf 100644 --- a/blog/archive/2008/12/index.html +++ b/blog/archive/2008/12/index.html @@ -368,11 +368,7 @@ larger stick as well.

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

  • multimedia (13)
    • -<<<<<<< index.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.248
  • nuug (119)
    • @@ -520,13 +512,8 @@ 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 1e3e64a8e6..fbff1a0c4c 100644 --- a/blog/archive/2009/01/index.html +++ b/blog/archive/2009/01/index.html @@ -535,11 +535,7 @@ produkter basert pÃ¥ standarden.

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

  • multimedia (13)
    • -<<<<<<< index.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.254
  • nuug (119)
    • @@ -687,13 +679,8 @@ 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 8f05a8ca4c..095d5c7392 100644 --- a/blog/archive/2009/02/index.html +++ b/blog/archive/2009/02/index.html @@ -513,11 +513,7 @@ do so.

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

  • multimedia (13)
    • -<<<<<<< index.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.239
  • nuug (119)
    • @@ -665,13 +657,8 @@ 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 71238c0f06..abcd9fc728 100644 --- a/blog/archive/2009/03/index.html +++ b/blog/archive/2009/03/index.html @@ -694,11 +694,7 @@ application that do not use open network protocol or open formats.

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

  • multimedia (13)
    • -<<<<<<< index.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.226
  • nuug (119)
    • @@ -846,13 +838,8 @@ 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 ccad0e87a8..70ccf6141f 100644 --- a/blog/archive/2009/04/index.html +++ b/blog/archive/2009/04/index.html @@ -490,11 +490,7 @@ properties.

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

  • multimedia (13)
    • -<<<<<<< index.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.215
  • nuug (119)
    • @@ -642,13 +634,8 @@ 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 efb5acf794..862150b4ec 100644 --- a/blog/archive/2009/05/index.html +++ b/blog/archive/2009/05/index.html @@ -449,11 +449,7 @@ bidrar positivt.

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

  • multimedia (13)
    • -<<<<<<< index.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.205
  • nuug (119)
    • @@ -601,13 +593,8 @@ 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 61f098f94e..5d1a6abbe6 100644 --- a/blog/archive/2009/06/index.html +++ b/blog/archive/2009/06/index.html @@ -224,11 +224,7 @@ misvisende pÃ¥stander etter i sømmene.

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

  • multimedia (13)
    • -<<<<<<< index.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.194
  • nuug (119)
    • @@ -376,13 +368,8 @@ 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 8773d1b9fa..a49784d3cf 100644 --- a/blog/archive/2009/07/index.html +++ b/blog/archive/2009/07/index.html @@ -210,11 +210,7 @@ non-predictable kernel in the early boot.

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

  • multimedia (13)
    • -<<<<<<< index.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.190
  • nuug (119)
    • @@ -362,13 +354,8 @@ 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 0b63d4fdfa..4ab8ca07c9 100644 --- a/blog/archive/2009/08/index.html +++ b/blog/archive/2009/08/index.html @@ -225,11 +225,7 @@ det viser at behovet for fribruks-sjøkart er til stedet.

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

  • multimedia (13)
    • -<<<<<<< index.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.185
  • nuug (119)
    • @@ -377,13 +369,8 @@ 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 dc0298c547..dc31d3e9ba 100644 --- a/blog/archive/2009/09/index.html +++ b/blog/archive/2009/09/index.html @@ -86,11 +86,7 @@ DRM mÃ¥ anses som et kjøp.

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

  • multimedia (13)
    • -<<<<<<< index.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.182
  • nuug (119)
    • @@ -238,13 +230,8 @@ 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 628c6c99c1..60fa42d637 100644 --- a/blog/archive/2009/10/index.html +++ b/blog/archive/2009/10/index.html @@ -196,11 +196,7 @@ nettbankkontroll over egne midler. :(
  • August (6)
    • -<<<<<<< index.html
  • September (3)
    • -======= -
  • September (2)
    • ->>>>>>> 1.182 @@ -314,11 +310,7 @@ nettbankkontroll over egne midler. :(
  • multimedia (13)
    • -<<<<<<< index.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.182
  • nuug (119)
    • @@ -348,13 +340,8 @@ 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 d9634d8689..0ca82c0830 100644 --- a/blog/archive/2009/11/index.html +++ b/blog/archive/2009/11/index.html @@ -183,11 +183,7 @@ nye i stedet.

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

  • multimedia (13)
    • -<<<<<<< index.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.180
  • nuug (119)
    • @@ -335,13 +327,8 @@ 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 78b80e39d0..a84e6e3be1 100644 --- a/blog/archive/2009/12/index.html +++ b/blog/archive/2009/12/index.html @@ -164,11 +164,7 @@ pÃ¥ flyplassene.

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

  • multimedia (13)
    • -<<<<<<< index.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.176
  • nuug (119)
    • @@ -316,13 +308,8 @@ 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 9088dea98e..b922fa80fb 100644 --- a/blog/archive/2010/01/index.html +++ b/blog/archive/2010/01/index.html @@ -149,11 +149,7 @@ platforme.

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

  • multimedia (13)
    • -<<<<<<< index.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.172
  • nuug (119)
    • @@ -301,13 +293,8 @@ 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 ff960b9ee2..95788e7567 100644 --- a/blog/archive/2010/02/index.html +++ b/blog/archive/2010/02/index.html @@ -82,11 +82,7 @@ and have just a few weeks or months to make it happen.

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

  • multimedia (13)
    • -<<<<<<< index.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.169
  • nuug (119)
    • @@ -234,13 +226,8 @@ 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 523d26bedd..6761fa944f 100644 --- a/blog/archive/2010/03/index.html +++ b/blog/archive/2010/03/index.html @@ -167,11 +167,7 @@ Hr. Fossen. MÃ¥ innrømme at jeg tviler pÃ¥ det.

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

  • multimedia (13)
    • -<<<<<<< index.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.170
  • nuug (119)
    • @@ -319,13 +311,8 @@ 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 03298a7910..07ad7a85c3 100644 --- a/blog/archive/2010/04/index.html +++ b/blog/archive/2010/04/index.html @@ -221,11 +221,7 @@ please contact us on debian-edu@lists.debian.org.

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

  • multimedia (13)
    • -<<<<<<< index.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.166
  • nuug (119)
    • @@ -373,13 +365,8 @@ 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 1bb80bf967..eafaf47385 100644 --- a/blog/archive/2010/05/index.html +++ b/blog/archive/2010/05/index.html @@ -601,11 +601,7 @@ list of usertagged bugs related to this.

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

  • multimedia (13)
    • -<<<<<<< index.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.170
  • nuug (119)
    • @@ -753,13 +745,8 @@ 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 cf3986beb2..d28a1cefff 100644 --- a/blog/archive/2010/06/index.html +++ b/blog/archive/2010/06/index.html @@ -990,11 +990,7 @@ changes, it will not be an option for Debian Edu based on Squeeze.

  • August (6)
    • -<<<<<<< index.html
  • September (3)
    • -======= -
  • September (2)
    • ->>>>>>> 1.162 @@ -1108,11 +1104,7 @@ 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)
    • @@ -1142,13 +1134,8 @@ 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 bea55f4400..d01eb6b821 100644 --- a/blog/archive/2010/07/index.html +++ b/blog/archive/2010/07/index.html @@ -1287,11 +1287,7 @@ it.

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

  • multimedia (13)
    • -<<<<<<< index.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.134
  • nuug (119)
    • @@ -1439,13 +1431,8 @@ 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 f62c1a604e..ea44bc317c 100644 --- a/blog/archive/2010/08/index.html +++ b/blog/archive/2010/08/index.html @@ -1010,11 +1010,7 @@ er fremmet av Erna Solberg, Michael Tetzschner og Trond Helleland.

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

  • multimedia (13)
    • -<<<<<<< index.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.121
  • nuug (119)
    • @@ -1162,13 +1154,8 @@ 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 b4c1e0b5ae..76791fea53 100644 --- a/blog/archive/2010/09/index.html +++ b/blog/archive/2010/09/index.html @@ -413,11 +413,7 @@ eller bare ser meg om etter alternativer.

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

  • multimedia (13)
    • -<<<<<<< index.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.109
  • nuug (119)
    • @@ -565,13 +557,8 @@ 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 4c1072bf95..a456858693 100644 --- a/blog/archive/2010/10/index.html +++ b/blog/archive/2010/10/index.html @@ -713,11 +713,7 @@ NRK1. :)

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

  • multimedia (13)
    • -<<<<<<< index.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.100
  • nuug (119)
    • @@ -865,13 +857,8 @@ 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 4c6bef3c12..f64dfbd1c4 100644 --- a/blog/archive/2010/11/index.html +++ b/blog/archive/2010/11/index.html @@ -1405,11 +1405,7 @@ vote this year.

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

  • multimedia (13)
    • -<<<<<<< index.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.89
  • nuug (119)
    • @@ -1557,13 +1549,8 @@ 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 f90783d622..cb932ba259 100644 --- a/blog/archive/2010/12/index.html +++ b/blog/archive/2010/12/index.html @@ -1201,11 +1201,7 @@ scared by the sketchy form of the current pages. :)

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

  • multimedia (13)
    • -<<<<<<< index.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.82
  • nuug (119)
    • @@ -1353,13 +1345,8 @@ 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 eff8f07f28..459f2897c2 100644 --- a/blog/archive/2011/01/index.html +++ b/blog/archive/2011/01/index.html @@ -1581,11 +1581,7 @@ for their packages.

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

  • multimedia (13)
    • -<<<<<<< index.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.68
  • nuug (119)
    • @@ -1733,13 +1725,8 @@ 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 d6c6eb14db..ce012ded86 100644 --- a/blog/archive/2011/02/index.html +++ b/blog/archive/2011/02/index.html @@ -542,11 +542,7 @@ er en god strategi Ã¥ bruke.

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

  • multimedia (13)
    • -<<<<<<< index.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.41
  • nuug (119)
    • @@ -694,13 +686,8 @@ 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 ac555c7a68..4c4836bc6a 100644 --- a/blog/archive/2011/03/index.html +++ b/blog/archive/2011/03/index.html @@ -548,11 +548,7 @@ fra Stopp DLD-organisasjonen for mer informasjon om dette.

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

  • multimedia (13)
    • -<<<<<<< index.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.34
  • nuug (119)
    • @@ -700,13 +692,8 @@ 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 09e14fde13..f271a5628d 100644 --- a/blog/archive/2011/04/index.html +++ b/blog/archive/2011/04/index.html @@ -526,11 +526,7 @@ to have a look. Please send feedback to the
  • August (6)
    • -<<<<<<< index.html
  • September (3)
    • -======= -
  • September (2)
    • ->>>>>>> 1.31 @@ -644,11 +640,7 @@ to have a look. Please send feedback to the
  • multimedia (13)
    • -<<<<<<< index.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.31
  • nuug (119)
    • @@ -678,13 +670,8 @@ 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 76a6d902df..5f4da91323 100644 --- a/blog/archive/2011/05/index.html +++ b/blog/archive/2011/05/index.html @@ -226,11 +226,7 @@ offentlige bør skrinlegges.

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

  • multimedia (13)
    • -<<<<<<< index.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.24
  • nuug (119)
    • @@ -378,13 +370,8 @@ 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 3cc3ab271b..c8a0b6903b 100644 --- a/blog/archive/2011/06/index.html +++ b/blog/archive/2011/06/index.html @@ -185,11 +185,7 @@ the time to read their content, the terms are simply unacceptable.

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

  • multimedia (13)
    • -<<<<<<< index.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.21
  • nuug (119)
    • @@ -337,13 +329,8 @@ 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 b41e3afc4b..6e04dfea83 100644 --- a/blog/archive/2011/07/index.html +++ b/blog/archive/2011/07/index.html @@ -502,11 +502,7 @@ find time to push this forward.

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

  • multimedia (13)
    • -<<<<<<< index.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.22
  • nuug (119)
    • @@ -654,13 +646,8 @@ 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 72168a9587..dc626ed641 100644 --- a/blog/archive/2011/08/index.html +++ b/blog/archive/2011/08/index.html @@ -347,11 +347,7 @@ Jeg hÃ¥per det blir bedre etter flytting i oktober.

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

  • multimedia (13)
    • -<<<<<<< index.html
  • norsk (137)
    • -======= -
  • norsk (136)
    • ->>>>>>> 1.13
  • nuug (119)
    • @@ -499,13 +491,8 @@ 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 32b42ed353..151d751ad1 100644 --- a/blog/archive/2011/09/09.rss +++ b/blog/archive/2011/09/09.rss @@ -64,7 +64,6 @@ 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 @@ -142,69 +141,5 @@ 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 716c28530e..3663f5f626 100644 --- a/blog/archive/2011/09/index.html +++ b/blog/archive/2011/09/index.html @@ -91,7 +91,6 @@ føre til at flere tar i bruk fri programvare.

    -<<<<<<< index.html
    Noen problemer rundt unikt nummererte stemmesedler i norske valg @@ -193,82 +192,6 @@ valgsystemet.

    -======= -
    -
    - 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