From: Ana Isabel Carvalho <ana.isabelc@gmail.com>
Date: Thu, 5 Jun 2014 02:03:48 +0000 (+0100)
Subject: Merge branch 'master' of vcs.fsf.org:enc
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=768f64fe632500e18e1c60aa90ff7f4af59c481f;p=enc-live.git

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

Conflicts:
	static
---

768f64fe632500e18e1c60aa90ff7f4af59c481f
diff --cc index.html
index ebf7e08,e70d8b1..2814b3a
--- a/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>