From: https://www.google.com/accounts/o8/id?id=AItOawl5d_XcizBQsBnAolhUAY54yMA6FO1TGyw <Tapani@web>
Date: Fri, 14 Feb 2014 12:45:31 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://vikisorsa.effi.org/?a=commitdiff_plain;h=2453cd41d5476f8365c01e3f2b594412d9550208;p=.git

---

diff --git a/index.mdwn b/index.mdwn
index 7899d77..fd64ed8 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -44,6 +44,7 @@ Tällä palvelimella olevia sivuja:
   * [Finnish Internet Forum](http://www.internetforum.fi), Helsinki 26.5.2014
   * [Stockholm Internet Forum](http://www.stockholminternetforum.se/), Tukholma 27-28.5.2014
   * [[kevätkokous 2014|kevatkokous2014]]
+  * [Computers, Freedom and Privacy](http://www.cfp.org/2014/wiki/index.php/CFP_2014) Warrenton, Virginia 8-10.6.2014
   * [EuroDIG Berliinissä](http://eurodig.org) 12-14.6.2014
   * [ICANNin kesäkokous Lontoossa](http://london50.icann.org) 22-26.6.2014
   * [ITU Plenipotentiary Conference Etelä-Koreassa](http://www.itu.int/en/plenipotentiary/) 20.10.-7.11.2014