X-Git-Url: http://pere.pagekite.me/gitweb/homepage.git/blobdiff_plain/a884e7517ce4372838bb8a30d89f818ba3b5768a..dfb95fbf632f9da5dc11eed5372f75cdd74da056:/blog/Free_Software_vs__proprietary_softare___.html?ds=sidebyside

diff --git a/blog/Free_Software_vs__proprietary_softare___.html b/blog/Free_Software_vs__proprietary_softare___.html
index 40a6bb5a59..4cf1960358 100644
--- a/blog/Free_Software_vs__proprietary_softare___.html
+++ b/blog/Free_Software_vs__proprietary_softare___.html
@@ -62,7 +62,11 @@ the time to read their content, the terms are simply unacceptable.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2015/05/">May (3)</a></li>
 
-<li><a href="http://people.skolelinux.org/pere/blog/archive/2015/06/">June (2)</a></li>
+<li><a href="http://people.skolelinux.org/pere/blog/archive/2015/06/">June (4)</a></li>
+
+<li><a href="http://people.skolelinux.org/pere/blog/archive/2015/07/">July (6)</a></li>
+
+<li><a href="http://people.skolelinux.org/pere/blog/archive/2015/08/">August (1)</a></li>
 
 </ul></li>
 
@@ -272,7 +276,7 @@ the time to read their content, the terms are simply unacceptable.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/chrpath">chrpath (2)</a></li>
 
- <li><a href="http://people.skolelinux.org/pere/blog/tags/debian">debian (109)</a></li>
+ <li><a href="http://people.skolelinux.org/pere/blog/tags/debian">debian (111)</a></li>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/debian edu">debian edu (153)</a></li>
 
@@ -280,21 +284,23 @@ the time to read their content, the terms are simply unacceptable.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/dld">dld (15)</a></li>
 
- <li><a href="http://people.skolelinux.org/pere/blog/tags/docbook">docbook (13)</a></li>
+ <li><a href="http://people.skolelinux.org/pere/blog/tags/docbook">docbook (15)</a></li>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/drivstoffpriser">drivstoffpriser (4)</a></li>
 
- <li><a href="http://people.skolelinux.org/pere/blog/tags/english">english (278)</a></li>
+ <li><a href="http://people.skolelinux.org/pere/blog/tags/english">english (285)</a></li>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/fiksgatami">fiksgatami (23)</a></li>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/fildeling">fildeling (12)</a></li>
 
- <li><a href="http://people.skolelinux.org/pere/blog/tags/freeculture">freeculture (15)</a></li>
+ <li><a href="http://people.skolelinux.org/pere/blog/tags/freeculture">freeculture (17)</a></li>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/freedombox">freedombox (9)</a></li>
 
- <li><a href="http://people.skolelinux.org/pere/blog/tags/frikanalen">frikanalen (15)</a></li>
+ <li><a href="http://people.skolelinux.org/pere/blog/tags/frikanalen">frikanalen (16)</a></li>
+
+ <li><a href="http://people.skolelinux.org/pere/blog/tags/h264">h264 (20)</a></li>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/intervju">intervju (42)</a></li>
 
@@ -312,17 +318,17 @@ the time to read their content, the terms are simply unacceptable.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/mesh network">mesh network (8)</a></li>
 
- <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (34)</a></li>
+ <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (36)</a></li>
 
- <li><a href="http://people.skolelinux.org/pere/blog/tags/norsk">norsk (262)</a></li>
+ <li><a href="http://people.skolelinux.org/pere/blog/tags/norsk">norsk (264)</a></li>
 
- <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (176)</a></li>
+ <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (177)</a></li>
 
- <li><a href="http://people.skolelinux.org/pere/blog/tags/offentlig innsyn">offentlig innsyn (16)</a></li>
+ <li><a href="http://people.skolelinux.org/pere/blog/tags/offentlig innsyn">offentlig innsyn (19)</a></li>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/open311">open311 (2)</a></li>
 
- <li><a href="http://people.skolelinux.org/pere/blog/tags/opphavsrett">opphavsrett (52)</a></li>
+ <li><a href="http://people.skolelinux.org/pere/blog/tags/opphavsrett">opphavsrett (53)</a></li>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/personvern">personvern (86)</a></li>
 
@@ -348,7 +354,7 @@ the time to read their content, the terms are simply unacceptable.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/skepsis">skepsis (4)</a></li>
 
- <li><a href="http://people.skolelinux.org/pere/blog/tags/standard">standard (47)</a></li>
+ <li><a href="http://people.skolelinux.org/pere/blog/tags/standard">standard (48)</a></li>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/stavekontroll">stavekontroll (3)</a></li>
 
@@ -362,11 +368,11 @@ the time to read their content, the terms are simply unacceptable.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/valg">valg (8)</a></li>
 
- <li><a href="http://people.skolelinux.org/pere/blog/tags/video">video (52)</a></li>
+ <li><a href="http://people.skolelinux.org/pere/blog/tags/video">video (54)</a></li>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/vitenskap">vitenskap (4)</a></li>
 
- <li><a href="http://people.skolelinux.org/pere/blog/tags/web">web (36)</a></li>
+ <li><a href="http://people.skolelinux.org/pere/blog/tags/web">web (37)</a></li>
 
 </ul>