X-Git-Url: http://pere.pagekite.me/gitweb/homepage.git/blobdiff_plain/a794e1d1b2158cf9ed1d28e32d56bd6883ab9ba5..8393ab63a500bb8855dcf92db99701fe2851ac0c:/blog/Free_Software_vs__proprietary_softare___.html?ds=inline

diff --git a/blog/Free_Software_vs__proprietary_softare___.html b/blog/Free_Software_vs__proprietary_softare___.html
index 07d6d8e7f9..2812e1ed11 100644
--- a/blog/Free_Software_vs__proprietary_softare___.html
+++ b/blog/Free_Software_vs__proprietary_softare___.html
@@ -56,7 +56,11 @@ the time to read their content, the terms are simply unacceptable.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2012/03/">March (17)</a></li>
 
-<li><a href="http://people.skolelinux.org/pere/blog/archive/2012/04/">April (10)</a></li>
+<li><a href="http://people.skolelinux.org/pere/blog/archive/2012/04/">April (12)</a></li>
+
+<li><a href="http://people.skolelinux.org/pere/blog/archive/2012/05/">May (12)</a></li>
+
+<li><a href="http://people.skolelinux.org/pere/blog/archive/2012/06/">June (14)</a></li>
 
 </ul></li>
 
@@ -175,21 +179,23 @@ the time to read their content, the terms are simply unacceptable.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/bsa">bsa (2)</a></li>
 
- <li><a href="http://people.skolelinux.org/pere/blog/tags/debian">debian (54)</a></li>
+ <li><a href="http://people.skolelinux.org/pere/blog/tags/debian">debian (55)</a></li>
+
+ <li><a href="http://people.skolelinux.org/pere/blog/tags/debian edu">debian edu (104)</a></li>
 
- <li><a href="http://people.skolelinux.org/pere/blog/tags/debian edu">debian edu (99)</a></li>
+ <li><a href="http://people.skolelinux.org/pere/blog/tags/digistan">digistan (9)</a></li>
 
- <li><a href="http://people.skolelinux.org/pere/blog/tags/digistan">digistan (8)</a></li>
+ <li><a href="http://people.skolelinux.org/pere/blog/tags/drivstoffpriser">drivstoffpriser (3)</a></li>
 
- <li><a href="http://people.skolelinux.org/pere/blog/tags/english">english (124)</a></li>
+ <li><a href="http://people.skolelinux.org/pere/blog/tags/english">english (136)</a></li>
 
- <li><a href="http://people.skolelinux.org/pere/blog/tags/fiksgatami">fiksgatami (15)</a></li>
+ <li><a href="http://people.skolelinux.org/pere/blog/tags/fiksgatami">fiksgatami (16)</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/intervju">intervju (23)</a></li>
+ <li><a href="http://people.skolelinux.org/pere/blog/tags/intervju">intervju (27)</a></li>
 
- <li><a href="http://people.skolelinux.org/pere/blog/tags/kart">kart (15)</a></li>
+ <li><a href="http://people.skolelinux.org/pere/blog/tags/kart">kart (16)</a></li>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/ldap">ldap (8)</a></li>
 
@@ -197,15 +203,17 @@ the time to read their content, the terms are simply unacceptable.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/ltsp">ltsp (1)</a></li>
 
- <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (16)</a></li>
+ <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (19)</a></li>
 
- <li><a href="http://people.skolelinux.org/pere/blog/tags/norsk">norsk (159)</a></li>
+ <li><a href="http://people.skolelinux.org/pere/blog/tags/norsk">norsk (175)</a></li>
 
- <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (123)</a></li>
+ <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (131)</a></li>
+
+ <li><a href="http://people.skolelinux.org/pere/blog/tags/offentlig innsyn">offentlig innsyn (2)</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 (24)</a></li>
+ <li><a href="http://people.skolelinux.org/pere/blog/tags/opphavsrett">opphavsrett (28)</a></li>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/personvern">personvern (47)</a></li>
 
@@ -221,25 +229,27 @@ the time to read their content, the terms are simply unacceptable.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/ruter">ruter (4)</a></li>
 
+ <li><a href="http://people.skolelinux.org/pere/blog/tags/scraperwiki">scraperwiki (1)</a></li>
+
  <li><a href="http://people.skolelinux.org/pere/blog/tags/sikkerhet">sikkerhet (23)</a></li>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/sitesummary">sitesummary (4)</a></li>
 
- <li><a href="http://people.skolelinux.org/pere/blog/tags/standard">standard (26)</a></li>
+ <li><a href="http://people.skolelinux.org/pere/blog/tags/standard">standard (31)</a></li>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/stavekontroll">stavekontroll (1)</a></li>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/stortinget">stortinget (4)</a></li>
 
- <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
+ <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (10)</a></li>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/valg">valg (6)</a></li>
 
- <li><a href="http://people.skolelinux.org/pere/blog/tags/video">video (25)</a></li>
+ <li><a href="http://people.skolelinux.org/pere/blog/tags/video">video (27)</a></li>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/vitenskap">vitenskap (1)</a></li>
 
- <li><a href="http://people.skolelinux.org/pere/blog/tags/web">web (19)</a></li>
+ <li><a href="http://people.skolelinux.org/pere/blog/tags/web">web (22)</a></li>
 
 </ul>