[FFmpeg-cvslog] [ffmpeg-web] branch master updated. 3dfacd7 web/index: Use HTML entity for the & in Click&Pledge

[gitolite]

The branch, master has been updated
       via  3dfacd7cc896e98d148f95dbf74bfd341ed5081b (commit)
       via  93cce3e924bd5330f6d58e7de48af69922f4dec2 (commit)
      from  9da587a87e5ca0d0091ba48a33f196baedf8ceb9 (commit)


- Log -----------------------------------------------------------------
commit 3dfacd7cc896e98d148f95dbf74bfd341ed5081b
Author:     Alexander Strasser <eclipse7 at gmx.net>
AuthorDate: Fri Oct 10 11:16:11 2014 +0200
Commit:     Alexander Strasser <eclipse7 at gmx.net>
CommitDate: Fri Oct 10 11:16:11 2014 +0200

    web/index: Use HTML entity for the & in Click&Pledge
    
    Found-by: W3C validator

diff --git a/src/index b/src/index
index 9446fea..243354b 100644
--- a/src/index
+++ b/src/index
@@ -112,7 +112,7 @@
     help us towards getting more than one intern.<br>
     You can donate by credit card using
     <a href="https://co.clickandpledge.com/advanced/default.aspx?wid=56226">
-    Click&Pledge</a> and selecting the "OPW" option. If you would like to
+    Click&Pledge</a> and selecting the "OPW" option. If you would like to
     donate by money transfer or by check, please get in touch by
     <a href="mailto:opw at ffmpeg.org">e-mail</a> and we will get back to you
     with instructions.<br>Thanks!

commit 93cce3e924bd5330f6d58e7de48af69922f4dec2
Author:     Alexander Strasser <eclipse7 at gmx.net>
AuthorDate: Sun Oct 5 22:46:22 2014 +0200
Commit:     Alexander Strasser <eclipse7 at gmx.net>
CommitDate: Fri Oct 10 11:14:57 2014 +0200

    web: News about FFmpeg in Debian
    
    Try to shortly summarize where we are now.

diff --git a/src/index b/src/index
index 2179120..9446fea 100644
--- a/src/index
+++ b/src/index
@@ -36,6 +36,21 @@
     News
   </h1>
 
+  <a id="ffmpeg_back_in_sid"></a><h3>October 10, 2014, FFmpeg is in Debian unstable again</h3>
+  <p>
+    We wanted you to know there are
+    <a href="https://packages.debian.org/search?keywords=ffmpeg&searchon=sourcenames&suite=unstable&section=main">
+    FFmpeg packages in Debian unstable</a> again. <strong>A big thank-you
+    to Andreas Cadhalpun and all the people that made it possible.</strong> It has been anything but simple.
+  </p>
+  <p>
+    Unfortunately that was already the easy part of this news. The bad news is the packages probably won't
+    migrate to Debian testing to be in the upcoming release codenamed jessie.
+    <a href="https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=763148">Read the argumentation over at Debian.</a>
+  </p>
+  <p>
+    <strong>However things will come out in the end, we hope for your continued remarkable support!</strong>
+  </p>
 
   <a id="opw03"></a><h3>October 8, 2014, FFmpeg secured a place in OPW!</h3>
   <p>

-----------------------------------------------------------------------

Summary of changes:
 src/index |   17 ++++++++++++++++-
 1 files changed, 16 insertions(+), 1 deletions(-)


hooks/post-receive
--