[claws-mail/epel7: 2/2] Merge branch 'master' into epel7

[Andreas Bierfert]

commit 2c99c6cc16197a5fcf44017454a1003b00384d54
Merge: a319c71 58693e7
Author: Andreas Bierfert <andreas.bierfert at lowlatency.de>
Date:   Tue Feb 3 11:39:12 2015 +0100

    Merge branch 'master' into epel7

 claws-mail.spec |   14 ++++++--------
 1 files changed, 6 insertions(+), 8 deletions(-)
---