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

diff --combined 2014/volunteer/index.html
index 42844230e03ac3fef29258f2a9d15c54247fc065,e2de8e2ad5bc0ca5805a21a56965f82df2b34143..046419053f42be1ebcb558a5986e436bb7ea540f
--- 1/2014/volunteer/index.html
--- 2/2014/volunteer/index.html
+++ b/2014/volunteer/index.html
@@@ -91,7 -91,7 +91,7 @@@
                          <li class="active"><a href="/2014/volunteer">Help plan LibrePlanet</a></li>
                          <li><a href="/2014/exhibit">Exhibition tables</a></li>
                          <li>
-                               <a href="https://libreplanet.org/wiki/LibrePlanet:Conference/2014/Conference_brainstorm_page">
+                               <a href="https://libreplanet.org/wiki/LibrePlanet:Conference/2014/Conference_brainstorm">
                                  Share your ideas</a></li>
                        </ul>
                        <ul class="nav nav-pills nav-stacked">
@@@ -111,7 -111,9 +111,7 @@@
                  <div class="col-sm-9"> <!-- start of LPC 14 main text -->
                        <h2> Volunteer <small>Registration</small> </h2>
  
 -                      <p>
 -                        This list will be used for planning the 2014
 -                        LibrePlanet conference. The volunteer committee will
 +<p>We welcome you to use the #libreplanet channel on Freenode for informal communication. To get more involved, join our volunteer planning committee with the form below. The volunteer committee will
                          meet monthly to plan the logistics of next year's
                          conference, such as advising on the program,
                          assisting with outreach efforts, and helping to plan