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

[Jon Ciesla]

commit 6d7f61e1da3ae1305d38abfe3145256b96bdea72
Merge: 6b8c87b 2b19798
Author: Jon Ciesla <limb at jcomserv.net>
Date:   Tue Sep 6 10:10:42 2011 -0500

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore

 .gitignore         |    6 ++++++
 roundcubemail.spec |    5 ++++-
 sources            |    2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)
---