From: k054 <kosa@riseup.net>
Date: Thu, 3 Dec 2015 00:28:05 +0000 (-0500)
Subject: Merge branch 'master' of vcs.fsf.org:enc-live
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=3c10fdb35d01731f52b857693f62e319c8b05d8a;p=enc.git

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

Conflicts:
	es/index.html
---

3c10fdb35d01731f52b857693f62e319c8b05d8a
diff --cc es/index.html
index 518b216b,7f52c220..2c05651e
--- a/es/index.html
+++ b/es/index.html
@@@ -514,18 -514,45 +514,61 @@@
  		<script src="//static.fsf.org/nosvn/enc-dev0/js/jquery-1.11.0.min.js"></script>
  		<script src="//static.fsf.org/nosvn/enc-dev0/js/scripts.js"></script>
  
++<<<<<<< HEAD
 +		<!-- Piwik -->
 +		<script type="text/javascript" >
 +		  // @license magnet:?xt=urn:btih:1f739d935676111cfff4b4693e3816e664797050&dn=gpl-3.0.txt GPL-v3-or-Later
 +		  var pkBaseURL = (("https:" == document.location.protocol) ? "https://piwik.fsf.org/" : "http://piwik.fsf.org/");
 +		  document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E"));
 +		  try {
 +		  var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", 13);
 +		  piwikTracker.trackPageView();
 +		  piwikTracker.enableLinkTracking();
 +		  } catch( err ) {}
 +		  // @license-end
 +		</script><noscript><p><img src="//piwik.fsf.org/piwik.php?idsite=13" style="border:0" alt="" /></p></noscript>
 +		<!-- End Piwik Tracking Code -->
++=======
+                 <!-- Piwik -->
+                 <script type="text/javascript">
+                  /*
+                  @licstart The following is the entire license notice for the
+                     JavaScript code in this page.
+ 
+                  Copyright 2014 Matthieu Aubry
+ 
+                   This program is free software: you can redistribute it and/or modify
+                  it under the terms of the GNU General Public License as published by
+                  the Free Software Foundation, either version 3 of the License, or
+                  (at your option) any later version.
+ 
+                   This program is distributed in the hope that it will be useful,
+                  but WITHOUT ANY WARRANTY; without even the implied warranty of
+                  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+                  GNU General Public License for more details.
+ 
+                   You should have received a copy of the GNU General Public License
+                  along with this program.  If not, see http://www.gnu.org/licenses/.
+ 
+                   @licend The above is the entire license notice
+                      for the JavaScript code in this page.
+                  */
+                  var _paq = _paq || [];
+                  _paq.push(["setDocumentTitle", document.domain + "/" + document.title]);
+                  _paq.push(["setCookieDomain", "*.www.fsf.org"]);
+                  _paq.push(["setDomains", ["*.www.fsf.org","*.www.fsf.org"]]);
+                  _paq.push(["trackPageView"]);
+                  _paq.push(["enableLinkTracking"]);
+ 
+                  (function() {
+                    var u=(("https:" == document.location.protocol) ? "https" : "http") + "://piwik.fsf.org/";
+                    _paq.push(["setTrackerUrl", u+"piwik.php"]);
+                    _paq.push(["setSiteId", "13"]);
+                    var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0]; g.type="text/javascript";
+                    g.defer=true; g.async=true; g.src=u+"piwik.js"; s.parentNode.insertBefore(g,s);
+                  })();
+                 </script>
+                 <!-- End Piwik Code -->
++>>>>>>> 61523e19beb09b58e395039bd70279ea863ab542
  	</body>
  </html>