[roundcubemail/f17: 6/6] Merge branch 'f18' into f17

[Jon Ciesla]

commit c2b41ad6bee78ce3f0255f80bb27dc63a6c0c721
Merge: 3056f27 c0a4a24
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Fri Feb 8 09:53:43 2013 -0600

    Merge branch 'f18' into f17

 .gitignore                     |    2 ++
 roundcubemail-0.8.2-mdb2.patch |   34 ++++++++++++++++++++++++++++++++++
 roundcubemail.conf             |    8 ++++++++
 roundcubemail.spec             |   17 ++++++++++++++++-
 sources                        |    2 +-
 5 files changed, 61 insertions(+), 2 deletions(-)
---