added marina and karen, matthew garrett
authorLibby <libby@allium.(none)>
Mon, 24 Feb 2014 17:00:06 +0000 (12:00 -0500)
committerLibby <libby@allium.(none)>
Mon, 24 Feb 2014 17:00:06 +0000 (12:00 -0500)
2014/program/index.html

index 48fa83bff7623ba89336c463a2c86730bbea9d9f..e92341d5e2d4b0de14bc512b1cc0f7210cca24e9 100644 (file)
 
 <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>
 
 <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>