Merge branch 'stable' of vcs.fsf.org:libreplanet-static into stable

diff --cc 2014/program/sessions.html
index 87e6c1149706d19778432e537457295a848d8d86,e7fb131be5b9c10944f8f693a51a5159d268d460..f5c12e712e18ac94ab5326768d2fd5a8c00522bd
--- 1/2014/program/sessions.html
--- 2/2014/program/sessions.html
+++ b/2014/program/sessions.html
@@@ -374,9 -374,9 +374,9 @@@ This session will be devoted to tech ac
  <p><em>Yochai Gal, Emily Lippold-Cheny, Leandro Monk</em> <br />
  <strong>Room 141 | Thread: Movement-building</strong>  </p>
  
- <h3>Free Software and Open Science</h3>
+ <h3>Free software and open science</h3>
  
 -<p><em>Madeleine Ball, Shauna Gordon-McKeon</em> <br />
 +<p><em>Madeleine Ball, Shauna Gordon-McKeon, Jeffrey Warren</em> <br />
  <strong>Room 155 | Thread: Applied free software</strong> <br />
  The open science movement is a grassroots and growing effort to make science publicly accessible. While securing open access to published results is the most well known open science issue, activists are also working towards: breaking down the barriers between scientist and non-scientist through participatory research and citizen science; opening up the data and methods of published studies to allow reproducible results and meta-analysis; and highlighting the importance of contributions beyond patents and papers, such as the creation of free hardware and free software tools.</p>