[kamera/f20: 10/10] Merge branch 'master' into f20

[Rex Dieter]

commit e922b9eb61ba05d4e0f9bff003f133a2643c7824
Merge: 05e74de 7d69db4
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 22:40:44 2014 -0500

    Merge branch 'master' into f20

 .gitignore  |    6 ++++++
 kamera.spec |   23 ++++++++++++++++++++++-
 sources     |    2 +-
 3 files changed, 29 insertions(+), 2 deletions(-)
---