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

diff --cc 2014/anti-harassment/index.html
index 3dc3ba6bcc17034e10995170413812f6d24ff448,38edb478577965c65903775858f14f58cbf2499e..0033953d5758b3cdd64474d4c7ef9281df52340f
--- 1/2014/anti-harassment/index.html
--- 2/2014/anti-harassment/index.html
+++ b/2014/anti-harassment/index.html
@@@ -17,9 -17,9 +17,9 @@@
                  <div class="row">
                        <div class="col-sm-7"> <!-- start of lp header -->
                          <div class="lp-head">
-                               <h1><a href="/2014/"> LibrePlanet <small>2014</small></a></h1>
+                               <h1><a href="/server/staging/lpc14"> LibrePlanet <small>2014</small></a></h1>
                                <p><strong>March 23rd-24th 2014 in Cambridge, MA</strong></p>
 -                              <p class="text-muted">The yearly conference of the free software community.</p>
 +                              <p class="text-muted">The yearly conference of the free software community</p>
                          </div>
                        </div><!-- end of lp header -->
                        <div class="col-sm-5"> <!-- start of signup form -->

diff --cc 2014/javascript/index.html
index 5512537aa15b76df2b868f52bb17be6e0860dc9c,59280f6bfb43b338b32dd3a90b76abc3d287314f..d641a4041e034ecc72e98c631feabca389a7f705
--- 1/2014/javascript/index.html
--- 2/2014/javascript/index.html
+++ b/2014/javascript/index.html
@@@ -16,9 -16,9 +16,9 @@@
                  <div class="row">
                        <div class="col-sm-7"> <!-- start of lp header -->
                          <div class="lp-head">
-                               <h1><a href="/2014/"> LibrePlanet <small>2014</small></a></h1>
+                               <h1><a href="/server/staging/lpc14"> LibrePlanet <small>2014</small></a></h1>
                                <p><strong>March 23rd-24th 2014 in Cambridge, MA</strong></p>
 -                              <p class="text-muted">The yearly conference of the free software community.</p>
 +                              <p class="text-muted">The yearly conference of the free software community</p>
                          </div>
                        </div><!-- end of lp header -->
                        <div class="col-sm-5"> <!-- start of signup form -->

diff --cc server/staging/lpc14/index.html
index 24f3dc438e0c30c6e3b998033c19785cef0f5e22,6d7ef4201ef6222c0ec841ba705fdb89eb92dcbb..bec67924465816a28cce9c9cd6132689a9c4bce0
--- 1/server/staging/lpc14/index.html
--- 2/server/staging/lpc14/index.html
+++ b/server/staging/lpc14/index.html
@@@ -17,9 -17,9 +17,9 @@@
                  <div class="row">
                        <div class="col-sm-7"> <!-- start of lp header -->
                          <div class="lp-head">
-                               <h1><a href="/2014/"> LibrePlanet <small>2014</small></a></h1>
+                               <h1><a href="/server/staging/lpc14"> LibrePlanet <small>2014</small></a></h1>
                                <p><strong>March 23rd-24th 2014 in Cambridge, MA</strong></p>
 -                              <p class="text-muted">The yearly conference of the free software community.</p>
 +                              <p class="text-muted">The yearly conference of the free software community</p>
                          </div>
                        </div><!-- end of lp header -->
                        <div class="col-sm-5"> <!-- start of signup form -->