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

diff --cc 2015/call_for_sessions/index.html
index beea7f4fbca42e3c42b3ae02ed95a5b9dd250ed9,072d49054ed448384bd56b29413751f037faa4e7..1520863e0cbd3f59e06aff47e71ff8fcc7b0e48e
--- 1/2015/call_for_sessions/index.html
--- 2/2015/call_for_sessions/index.html
+++ b/2015/call_for_sessions/index.html
@@@ -1,7 -1,7 +1,7 @@@
- <!--#include virtual="/2015/header.html"-->
+ <!--#include virtual="/server/2015/header.html"-->
  <h2> Call for Sessions (form in development)</h2>
  
 -<p>The Call for Sessions for LibrePlanet 2015 is open from <strong>Monday, September 15th, 2014 to Sunday, November 2nd, 2014 at 23:59 EST (04:59 Monday November 3rd UTC).</strong></p>
 +<p>The Call for Sessions for LibrePlanet 2015 is open from <strong>Monday, September 15th, 2014</strong> to <strong>Sunday, November 2nd, 2014 at 19:59 EST (23:59 UTC)</strong>.</p>
  <p>This year, the theme of LibrePlanet is "Free Software Everywhere." We're looking for talks that touch on the many places and ways that free software is used around the world, as well as ways to make free software ubiquitous. Think "where" in the broadest sense of the word--it's not just geography-based talks we're after. What are some contexts where free software is thriving, and some others where it needs a push? How have you worked to gain a stronghold for free software in your company or community? And what about free software on all of the myriad pieces of hardware we use, including laptops, phones, tablets, and even coffee makers? At LibrePlanet 2015, we're taking software freedom around the world, to outer space, and through all kinds of industries, governments, organizations, fields of study, and communities.</p>
  
  <h2>Should I submit a session proposal for LibrePlanet?</h2>
@@@ -32,21 -32,22 +32,22 @@@
  
  <p>At LibrePlanet, we are looking for sessions that embrace the free software movement's ideals and also its language. For example, successful proposals will use phrases like "free software" and avoid phrases like "open source". </p>
  
 -<h2>Past session</h2>
 +<h2>Past sessions</h2>
  
  <ul>
- <li><a href="http://libreplanet.org/2014/program/grid_schedule.html">2014</a>    </li>
- <li><p><a href="http://libreplanet.org/wiki/LibrePlanet:Conference/2013/Program">2013</a>    </p>
- 
- 
+   <li><a href="http://libreplanet.org/2014/program/grid_schedule.html">2014</a></li>
+   <li><a href="http://libreplanet.org/wiki/LibrePlanet:Conference/2013/Program">2013</a></li>
  </ul>
- <h2>Other ways to engage</h2></li>
+ 
+ <h2>Other ways to engage</h2>
  <p>There is also a place on the proposal form to indicate if you would like to participate in the conference in other ways in addition to your session – by framing and moderating a panel; facilitating a caucus space; sharing media-making skills; demonstrating something cool in the exhibit hall; or blogging about the conference. Please let us know about the community-building skills you have to share!</p>
  
-                       <form action="https://crm.fsf.org/civicrm/profile/create?gid=236&amp;reset=1"
-                          class="form-horizontal margin-top" method="post" name="Edit"
+                       <form action="https://crm.fsf.org/civicrm/profile/create?gid=325&amp;reset=1"
+                                 class="form-horizontal margin-top" method="post" name="Edit"
                           id="Edit1" >
                          <div>
+                               <input name="entryURL" type="hidden"
+                                          value="https://crm.fsf.org/civicrm/contact/view/delete?=&amp;amp;reset=1&amp;amp;delete=1&amp;amp;cid=743827" />
                                <input name="postURL" type="hidden"
                                           value="https://libreplanet.org/2014/call_for_sessions/confirmation.html" />
                                <input name="cancelURL" type="hidden"