X-Git-Url: http://pere.pagekite.me/gitweb/homepage.git/blobdiff_plain/5dbe5f4ba63007f3f66f69de792db0a9a385ca81..ebfb53b51b789a038b3157fc273aaf96559b76c4:/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 333e3bba82..219f7fbdd6 100644
--- a/blog/Free_Software_vs__proprietary_softare___.html
+++ b/blog/Free_Software_vs__proprietary_softare___.html
@@ -49,6 +49,21 @@ the time to read their content, the terms are simply unacceptable.</p>
 <h2>Archive</h2>
 <ul>
 
+<li>2015
+<ul>
+
+<li><a href="http://people.skolelinux.org/pere/blog/archive/2015/01/">January (7)</a></li>
+
+<li><a href="http://people.skolelinux.org/pere/blog/archive/2015/02/">February (6)</a></li>
+
+<li><a href="http://people.skolelinux.org/pere/blog/archive/2015/03/">March (1)</a></li>
+
+<li><a href="http://people.skolelinux.org/pere/blog/archive/2015/04/">April (4)</a></li>
+
+<li><a href="http://people.skolelinux.org/pere/blog/archive/2015/05/">May (2)</a></li>
+
+</ul></li>
+
 <li>2014
 <ul>
 
@@ -74,7 +89,7 @@ the time to read their content, the terms are simply unacceptable.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2014/11/">November (3)</a></li>
 
-<li><a href="http://people.skolelinux.org/pere/blog/archive/2014/12/">December (3)</a></li>
+<li><a href="http://people.skolelinux.org/pere/blog/archive/2014/12/">December (5)</a></li>
 
 </ul></li>
 
@@ -257,29 +272,29 @@ the time to read their content, the terms are simply unacceptable.</p>
 
  <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 edu">debian edu (151)</a></li>
+ <li><a href="http://people.skolelinux.org/pere/blog/tags/debian edu">debian edu (153)</a></li>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/digistan">digistan (10)</a></li>
 
  <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 (12)</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/drivstoffpriser">drivstoffpriser (4)</a></li>
 
- <li><a href="http://people.skolelinux.org/pere/blog/tags/english">english (264)</a></li>
+ <li><a href="http://people.skolelinux.org/pere/blog/tags/english">english (277)</a></li>
 
- <li><a href="http://people.skolelinux.org/pere/blog/tags/fiksgatami">fiksgatami (21)</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 (14)</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/freedombox">freedombox (9)</a></li>
 
- <li><a href="http://people.skolelinux.org/pere/blog/tags/frikanalen">frikanalen (11)</a></li>
+ <li><a href="http://people.skolelinux.org/pere/blog/tags/frikanalen">frikanalen (14)</a></li>
 
- <li><a href="http://people.skolelinux.org/pere/blog/tags/intervju">intervju (41)</a></li>
+ <li><a href="http://people.skolelinux.org/pere/blog/tags/intervju">intervju (42)</a></li>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/isenkram">isenkram (10)</a></li>
 
@@ -297,17 +312,17 @@ the time to read their content, the terms are simply unacceptable.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (32)</a></li>
 
- <li><a href="http://people.skolelinux.org/pere/blog/tags/norsk">norsk (251)</a></li>
+ <li><a href="http://people.skolelinux.org/pere/blog/tags/norsk">norsk (260)</a></li>
 
- <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (164)</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/offentlig innsyn">offentlig innsyn (11)</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/open311">open311 (2)</a></li>
 
- <li><a href="http://people.skolelinux.org/pere/blog/tags/opphavsrett">opphavsrett (50)</a></li>
+ <li><a href="http://people.skolelinux.org/pere/blog/tags/opphavsrett">opphavsrett (51)</a></li>
 
- <li><a href="http://people.skolelinux.org/pere/blog/tags/personvern">personvern (78)</a></li>
+ <li><a href="http://people.skolelinux.org/pere/blog/tags/personvern">personvern (85)</a></li>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/raid">raid (1)</a></li>
 
@@ -337,17 +352,19 @@ the time to read their content, the terms are simply unacceptable.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/stortinget">stortinget (9)</a></li>
 
- <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (28)</a></li>
+ <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (32)</a></li>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/sysadmin">sysadmin (2)</a></li>
 
+ <li><a href="http://people.skolelinux.org/pere/blog/tags/usenix">usenix (2)</a></li>
+
  <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 (46)</a></li>
+ <li><a href="http://people.skolelinux.org/pere/blog/tags/video">video (50)</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 (34)</a></li>
+ <li><a href="http://people.skolelinux.org/pere/blog/tags/web">web (35)</a></li>
 
 </ul>