[zarafa/el5: 2/2] Merge remote branch 'origin/master' into el5

[Robert Scheck]

commit 43a93782ed22f98c44a14a7ea53d14d239780609
Merge: 6a66c51 510c998
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Wed Oct 15 03:43:49 2014 +0200

    Merge remote branch 'origin/master' into el5

 sources |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---