From: Ana Isabel Carvalho <ana.isabelc@gmail.com>
Date: Wed, 4 Jun 2014 23:28:51 +0000 (+0100)
Subject: Merge branch 'master' of vcs.fsf.org:enc
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=c919b2d2ffa016b29378a9a86b0d83bfa3d668bb;p=enc.git

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

Conflicts:
	static
---

c919b2d2ffa016b29378a9a86b0d83bfa3d668bb
diff --cc index.html
index 58722371,d325c9f8..7bbb8adb
--- a/index.html
+++ b/index.html
@@@ -41,10 -41,10 +41,9 @@@
  				<h1>Email Self-Defense</h1>
  
  				<!-- ~~~~~~~~~ FSF Introduction ~~~~~~~~~ -->
--								<div id="fsf-intro">
--									<h3><a href="http://u.fsf.org/ys"><img alt="Free Software Foundation" src="//static.fsf.org/nosvn/enc-dev0/img/fsf-logo.png"></a></h3>
--									<p>Email Self-Defense is a project of the Free Software Foundation. The FSF works to secure freedom for computer users by promoting the development and use of free (as in freedom) software and documentation.</p><p>We have big plans to get it in the hands of people under bulk surveillance all over the world, and make more tools like it. Can you make a donation to help us achieve that goal?   
--				</p>
++				<div id="fsf-intro">
++					<h3><a href="http://u.fsf.org/ys"><img alt="Free Software Foundation" src="//static.fsf.org/nosvn/enc-dev0/img/fsf-logo.png"></a></h3>
++					<p>Email Self-Defense is a project of the Free Software Foundation. The FSF works to secure freedom for computer users by promoting the development and use of free (as in freedom) software and documentation.</p><p>We have big plans to get it in the hands of people under bulk surveillance all over the world, and make more tools like it. Can you make a donation to help us achieve that goal?</p>
  
  					<!--<p><a href="https://u.fsf.org/yr"><img alt="Join now" src="http://static.fsf.org/nosvn/enc-dev0/img/join.en.png"></a></p>-->
  					<p><a href="https://u.fsf.org/7w"><img alt="Donate" src="//static.fsf.org/nosvn/enc-dev0/img/donate.en.png"></a></p>