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

[Rex Dieter]

commit 86b6fe9ebf87948ba78401e6b52c08fd63135269
Merge: 52eb3e1 ea6d7a8
Author: Rex Dieter <rdieter at gmail.com>
Date:   Sun Mar 1 17:09:45 2015 -0600

    Merge branch 'master' into f20

 .gitignore  |  2 ++
 kamera.spec | 14 +++++++++++++-
 sources     |  2 +-
 3 files changed, 16 insertions(+), 2 deletions(-)
---