[roundcubemail/el6: 10/10] Merge branch 'f18' into el6

[Jon Ciesla]

commit 8c4497d71a1678b65b1b843273ce80110bd4fb49
Merge: 5677064 c0a4a24
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Fri Feb 8 09:56:06 2013 -0600

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

 .gitignore                     |   14 +++-----------
 roundcubemail-0.8.2-mdb2.patch |   34 ++++++++++++++++++++++++++++++++++
 roundcubemail.conf             |    8 ++++++++
 roundcubemail.spec             |   32 ++++++++++++++++++++++++++++----
 sources                        |    2 +-
 5 files changed, 74 insertions(+), 16 deletions(-)
---
diff --cc .gitignore
index 1fcb578,d08fd8e..edd6029
--- a/.gitignore
+++ b/.gitignore
@@@ -1,12 -1,15 +1,4 @@@
--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
--/roundcubemail-0.5.4-dep.tar.gz
--/roundcubemail-0.6-dep.tar.gz
--/roundcubemail-0.7-dep.tar.gz
--/roundcubemail-0.7.1-dep.tar.gz
--/roundcubemail-0.7.2-dep.tar.gz
--/roundcubemail-0.7.3-dep.tar.gz
+ /roundcubemail-0.8.1-dep.tar.gz
+ /roundcubemail-0.8.2-dep.tar.gz
  /roundcubemail-0.8.4-dep.tar.gz
+ /roundcubemail-0.8.5-dep.tar.gz
diff --cc roundcubemail.spec
index 231c1a0,fbe644d..e6d9428
--- a/roundcubemail.spec
+++ b/roundcubemail.spec
@@@ -140,8 -143,28 +143,29 @@@ exit 
  %config(noreplace) %{_sysconfdir}/logrotate.d/roundcubemail
  
  %changelog
- * Mon Jan 14 2013 Jon Ciesla <limburgher at gmail.com> - 0.8.4-1
- - 0.8.4, BZ 890656.
+ * Fri Feb 08 2013 Jon Ciesla <limburgher at gmail.com> - 0.8.5-1
+ - Latest upstream.
+ 
+ * Mon Nov 19 2012 Jon Ciesla <limburgher at gmail.com> - 0.8.4-1
+ - Latest upstream.
+ 
+ * Mon Oct 29 2012 Remi Collet <remi at fedoraproject.org> - 0.8.2-3
+ - fix configuration for httpd 2.4 (#871123)
+ 
+ * Sun Oct 28 2012 Remi Collet <remi at fedoraproject.org> - 0.8.2-2
+ - add fix for latest MDB2 (#870933)
+ 
+ * Wed Oct 10 2012 Jon Ciesla <limburgher at gmail.com> - 0.8.2-1
+ - Latest upstream.
+ 
+ * Thu Aug 30 2012 Adam Williamson <awilliam at redhat.com> - 0.8.1-2
+ - correct stray parenthesis in strict patch
+ 
+ * Mon Aug 20 2012 Jon Ciesla <limburgher at gmail.com> - 0.8.1-1
+ - Latest upstream.
+ - Updated strict patch.
+ - XSS patch upstreamed.
++>>>>>>> f18
  
  * Mon Aug 20 2012 Jon Ciesla <limburgher at gmail.com> - 0.7.3-1
  - 0.7.3, patch for XSS in signature issue, BZ 849616, 849617.