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

[Rex Dieter]

commit 9fa582b6db67421232fd456c10011aecaf9d31c3
Merge: 5cb3c0a bb39917
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jan 19 15:43:31 2015 -0600

    Merge branch 'master' into f20

 .gitignore     |    1 +
 filelight.spec |    9 ++++++---
 sources        |    2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)
---