[zarafa/f21: 2/2] Merge branch 'master' into f21

[Rex Dieter]

commit 7e34c68abe40401e498c040c31b05b7d532bf43b
Merge: 09deb48 2fe3888
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Dec 2 14:05:11 2014 -0600

    Merge branch 'master' into f21

 zarafa.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---