[roundcubemail/f19: 2/2] Merge commit 'cccf90a36af5414448f4f641b3e7427fa78117fc' into f19

[Adam Williamson]

commit da2217df06c0d52d8a64dda7dee1fe302ef1f0ea
Merge: 61bf2a8 cccf90a
Author: Adam Williamson <awilliam at redhat.com>
Date:   Fri Aug 23 14:05:42 2013 -0700

    Merge commit 'cccf90a36af5414448f4f641b3e7427fa78117fc' into f19

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