From: Libby <libby@allium.(none)>
Date: Mon, 24 Feb 2014 17:00:06 +0000 (-0500)
Subject: added marina and karen, matthew garrett
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=5777b3bf6bfbbe85791dea9fda674bc457dd3b4d;p=libreplanet-static.git

added marina and karen, matthew garrett
---

diff --git a/2014/program/index.html b/2014/program/index.html
index 48fa83bf..e92341d5 100644
--- a/2014/program/index.html
+++ b/2014/program/index.html
@@ -112,6 +112,10 @@
 
 <p><em>ginger coons, Kÿra, Femke Snelting</em>  </p>
 
+<h3>Choosing between freedom and security</h3>
+
+<p><em>Matthew Garrett</em></p>  
+
 <h3>Considering the future of copyleft: How will the next generation perceive GPL?</h3>
 
 <p><em>Bradley Kuhn</em>  </p>
@@ -120,6 +124,10 @@
 
 <p><em>Fateh Slavitskaya</em>  </p>
 
+<h3>Diversity Outreach</h3>
+
+<p><em>Karen Sandler, Marina Zhurakhinskaya</em></p> 
+
 <h3>Everybody spies</h3>
 
 <p><em>Kade Crockford, Josh Levy</em></p>