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

[Jon Ciesla]

commit 6b8c87b0f58fa806dca6409bea424f54b5118186
Merge: dfe43ba 1143837
Author: Jon Ciesla <limb at jcomserv.net>
Date:   Thu Jul 7 07:41:43 2011 -0500

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	roundcubemail.spec
    	sources

 .gitignore                              |    1 -
 roundcubemail-0.4.1-confpath.patch      |   12 +++++++++
 roundcubemail-0.4.1-pg-mdb2.patch       |   11 ++++++++
 roundcubemail-0.5.1-CVE-2010-0464.patch |   17 +++++++++++++
 roundcubemail.spec                      |   39 ++++++++++++++++++++++++------
 sources                                 |    2 +-
 6 files changed, 72 insertions(+), 10 deletions(-)
---
diff --cc .gitignore
index 567c6c1,a8f9bb3..e69de29
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,5 +1,0 @@@
- roundcubemail-0.3-stable-dep.tar.gz
 -roundcubemail-0.3.1-dep.tar.gz
 -/roundcubemail-0.4.2-dep.tar.gz
 -/roundcubemail-0.5.1-dep.tar.gz
 -/roundcubemail-0.5.2-dep.tar.gz
 -/roundcubemail-0.5.3-dep.tar.gz