[roundcubemail/el6: 9/9] Merge branch 'master' into el6

[Jon Ciesla]

commit 36df8d4849779fafe24a35edbb8d79dba0524670
Merge: 6d7f61e 0676810
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Mon Jun 11 09:44:22 2012 -0500

    Merge branch 'master' into el6

 .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.logrotate                    |    1 +
 roundcubemail.spec                         |   50 ++++++++++-----
 sources                                    |    2 +-
 17 files changed, 60 insertions(+), 299 deletions(-)
---