[digikam/f20: 7/7] Merge branch 'master' into f20

[Rex Dieter]

commit 005e2c2c5257e40ad93dd7cbefcc710f97351264
Merge: 03d40c2 22788db
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 13:06:06 2014 -0500

    Merge branch 'master' into f20

 .gitignore                   |    1 +
 digikam-3.1.0-opencv20.patch |  123 ------------------------------------------
 digikam.spec                 |   48 +++++++++-------
 sources                      |    2 +-
 4 files changed, 29 insertions(+), 145 deletions(-)
---