Merge branch 'master' of vcs.fsf.org:enc

Conflicts:
	static

diff --cc index.html
index ebf7e0897c99b8719857b1337397f7d7793d6f8d,e70d8b16dc357cb922d4a218bebc116a18f81602..2814b3a56196f2a2bfa9598702616fd2d5c3136a
--- 1/index.html
--- 2/index.html
+++ b/index.html
@@@ -425,7 -467,7 +466,7 @@@
                                                </ul>
                                        </div><!-- End .main -->
                                </div><!-- End #step-contribute .step -->
--                                      
++
                        </div>
                </section><!-- End #section6 -->
  
@@@ -512,6 -554,6 +553,5 @@@
                   })();
                  </script>
                  <!-- End Piwik Code -->
--
        </body>
  </html>