[roundcubemail/f15: 13/13] Merge branch 'f16' into f15

[Jon Ciesla]

commit 83223c15abea7a4601436ff22d9af9a18f391c57
Merge: 82f5108 f0d3a4c
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Mon Jun 11 09:42:59 2012 -0500

    Merge branch 'f16' into f15
    
    Conflicts:
    	roundcubemail.spec

 .gitignore                                 |    4 +
 roundcubemail-0.1.1-mysql.update.sql.patch |   11 ---
 roundcubemail-0.1.1-pear.patch             |   11 ---
 roundcubemail-0.2-CVE-2009-0413.patch      |   24 -------
 roundcubemail-0.2-alpha-confpath.patch     |   18 -----
 roundcubemail-0.2-beta-CVE-2008-5620.patch |   60 ------------------
 roundcubemail-0.2-beta-confpath.patch      |   12 ----
 roundcubemail-0.2-beta-html2text.patch     |   94 ----------------------------
 roundcubemail-0.2-stable-pg-mdb2.patch     |    5 --
 roundcubemail-0.3.1-CVE-2010-0464.patch    |   17 -----
 roundcubemail-0.4.1-pg-mdb2.patch          |   11 ---
 roundcubemail-0.5.1-CVE-2010-0464.patch    |   17 -----
 roundcubemail-0.7.1-strict.patch           |   11 +++
 roundcubemail-0.7.2-strict.patch           |   11 +++
 roundcubemail.spec                         |   52 +++++++++-------
 sources                                    |    2 +-
 16 files changed, 57 insertions(+), 303 deletions(-)
---