[digikam/f20: 23/23] Merge commit '58aae0ce42395812758be5e3b71cfd8f22363a05' into f20

[Rex Dieter]

commit 03d40c22498709ac58154d69407fca065b144d7b
Merge: 3329f03 58aae0c
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 1 14:00:15 2014 -0500

    Merge commit '58aae0ce42395812758be5e3b71cfd8f22363a05' into f20

 .gitignore                           |   16 +--------
 digikam-3.5.0-panorama-crasher.patch |   28 --------------
 digikam.spec                         |   66 ++++++++++++++++++++++++++--------
 sources                              |    2 +-
 4 files changed, 53 insertions(+), 59 deletions(-)
---