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

[Rex Dieter]

commit 8c5bc9d392c7a17a7396e47434748dfe8ef3be4b
Merge: 56d2032 6a1b7f8
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 12:21:27 2014 -0500

    Merge branch 'master' into f20

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