[FFmpeg-cvslog] [ffmpeg-web] branch master updated. e0e1625 web/security: remove duplicate entries

[gitolite]

The branch, master has been updated
       via  e0e16253e838d53449001951c894395fa5afc070 (commit)
      from  49e14d34dc94470cf2ff1c442a675516aece5b67 (commit)


- Log -----------------------------------------------------------------
commit e0e16253e838d53449001951c894395fa5afc070
Author:     Michael Niedermayer <michaelni at gmx.at>
AuthorDate: Mon Feb 24 18:49:02 2014 +0100
Commit:     Michael Niedermayer <michaelni at gmx.at>
CommitDate: Mon Feb 24 18:49:02 2014 +0100

    web/security: remove duplicate entries
    
    Found-by: Andreas Cadhalpun

diff --git a/src/security b/src/security
index 9a5795e..f085b72 100644
--- a/src/security
+++ b/src/security
@@ -177,12 +177,10 @@ CVE-2013-0862, 8eda88868399de00806cf21a966d9660db4ae9b4 / 49b729d3af8464de431362
 Fixes following vulnerabilities:
 </p>
 <pre>
-CVE-2012-6617, 9929991da7b843e7d80154fcacc4e80579b86a2d / cbe43e62c9ac7d4aefdc13476f6f691bd626525f
-CVE-2012-6618, e74cd2f4706f71da5e9205003c1d8263b54ed3fb / 03847eb8259291b4ff1bd840bd779d0699d71f96
 commit 20c121c00747d6c3b0b0f98deeff021171b2ed74 / c83002a4f8042ccfa0688a9a18e8fa0369c1fda8
 commit 68e48ed72e0597ae61bc3e9e6e6d9edcb1a00073 / 7d66bc7920240cc0e8df6c44b2d2cdbe4b228fbe
-commit 9929991da7b843e7d80154fcacc4e80579b86a2d / cbe43e62c9ac7d4aefdc13476f6f691bd626525f
-commit e74cd2f4706f71da5e9205003c1d8263b54ed3fb / 03847eb8259291b4ff1bd840bd779d0699d71f96
+CVE-2012-6617, 9929991da7b843e7d80154fcacc4e80579b86a2d / cbe43e62c9ac7d4aefdc13476f6f691bd626525f
+CVE-2012-6618, e74cd2f4706f71da5e9205003c1d8263b54ed3fb / 03847eb8259291b4ff1bd840bd779d0699d71f96
 </pre>
 
 <h3>1.0.1</h3>

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

Summary of changes:
 src/security |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)


hooks/post-receive
--