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

[Jon Ciesla]

commit b343413f9e2870823ee3b646ea27f3531b8a2fb2
Merge: 9e94501 cccf90a
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Mon Aug 26 07:45:01 2013 -0500

    Merge branch 'master' into el6

 roundcubemail-0.9.3-no_swf.patch |    6 ++++++
 roundcubemail.spec               |   13 ++++++++++---
 2 files changed, 16 insertions(+), 3 deletions(-)
---