[digikam: 2/2] Merge branch 'epel7'

[Rex Dieter]

commit cd1982c379c562c109607c0b72e892d76db7a09b
Merge: 7eaa4e5 629a4e1
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jul 21 20:26:56 2014 -0500

    Merge branch 'epel7'

 digikam.spec |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)
---