Merge branch 'master' into stable

[libreplanet-static.git] / 2016 / speakers.ids

diff --git a/2016/speakers.ids b/2016/speakers.ids
index 0f4d303fbf07db8f6b6f64420fecf1d3195bda54..ec948645103a9fa56dba36d357832f72e6dd5f12 100644 (file)
--- a/2016/speakers.ids
+++ b/2016/speakers.ids
@@ -1,47 +1,58 @@
 {
-    "Daniel Kahn Gillmor": "gillmor", 
+    "Edward Snowden": "snowden", 
     "Allison Randal": "randal", 
     "Karen Sandler": "sandler", 
-    "Edward Snowden": "snowden", 
     "Richard Stallman": "stallman", 
+    "Daniel Kahn Gillmor": "gillmor", 
     "Emmanuel": "emmanuel", 
-    "Michaela R. Brown": "brown", 
+    "Sunil Mohan Adapa": "adapa", 
+    "Tim Ansell": "ansell", 
+    "Walter Bender": "bender", 
     "Brian Callahan": "callahan", 
+    "Mishi Choudhary": "choudhary", 
     "George Chriss": "chriss", 
     "Jes Ciacci": "ciacci", 
     "Marianne Corvellec": "corvellec", 
     "Adrien Béraud": "beraud", 
     "Molly de Blanc": "blanc", 
+    "Kevin Connor": "connor", 
     "Scott Dexter": "dexter", 
+    "Nima Fatemi": "fatemi", 
     "Richard Fontana": "fontana", 
     "Mike Gerwitz": "gerwitz", 
     "Judy Gichoya": "gichoya", 
     "Erin Glass": "glass", 
     "Shauna Gordon-McKeon": "gordon-mckeon", 
-    "Molly Gott": "gott", 
     "Sumana Harihareswara": "harihareswara", 
     "Parker Higgins": "higgins", 
-    "MJ Kaplan": "kaplan", 
+    "Benjamin Mako Hill": "hill", 
+    "Carl Karsten": "karsten", 
     "Bradley Kuhn": "kuhn", 
     "Bassam Kurdali": "kurdali", 
     "Jonathan Le Lous": "lous", 
     "Matt Lee": "lee", 
     "Lillian Lemmer": "lemmer", 
     "Holger Levsen": "levsen", 
+    "Alison Macrina": "macrina", 
+    "Neil McGovern": "mcgovern", 
     "M. C. McGrath": "mcgrath", 
     "Evan Misshula": "misshula", 
     "Gibrán Montes": "montes", 
     "Deb Nicholson": "nicholson", 
     "Alexandre Oliva": "oliva", 
     "Paige Peterson": "peterson", 
+    "Silvia Pfeiffer": "pfeiffer", 
     "Cooper Quintin": "quintin", 
+    "Zak Rogoff": "rogoff", 
     "Guillaume Roguez": "roguez", 
     "Enrique Rosas": "rosas", 
+    "Francis Rowe": "rowe", 
     "Felipe Correa da Silva Sanches": "sanches", 
     "Eric Schultz": "schultz", 
     "Andrew Seeder": "seeder", 
     "Matthew Skomarovsky": "skomarovsky", 
     "David Thompson": "thompson", 
+    "Devin Ulibarri": "ulibarri", 
     "Luis Villa": "villa", 
     "Christopher Webber": "webber", 
     "Marina Zhurakhinskaya": "zhurakhinskaya",