[filelight/f20: 9/9] Merge branch 'master' into f20

[Rex Dieter]

commit 276fa7ad8284906589943eb42603d57c25746783
Merge: b638ac3 33c038b
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Feb 3 07:28:29 2014 -0600

    Merge branch 'master' into f20

 .gitignore     |    6 ++++++
 filelight.spec |   20 +++++++++++++++++++-
 sources        |    2 +-
 3 files changed, 26 insertions(+), 2 deletions(-)
---