[filelight/f19: 7/7] Merge branch 'master' into f19

[Rex Dieter]

commit a8eec7c5af344023fd5f7af14059bbd8d3ba658f
Merge: 1604594 c50ff58
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Thu Sep 5 13:00:50 2013 -0500

    Merge branch 'master' into f19

 .gitignore     |    5 +++++
 filelight.spec |   17 ++++++++++++++++-
 sources        |    2 +-
 3 files changed, 22 insertions(+), 2 deletions(-)
---