[kamera/f17: 2/2] Merge branch 'f18' into f17

[Rex Dieter]

commit 13cceeddd8862c28b8394048f469a052d732fde5
Merge: cffd907 8914fa2
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sun Dec 30 14:31:07 2012 -0600

    Merge branch 'f18' into f17

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