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

[Rex Dieter]

commit 151098cebf526c77c21c24185a1279730d4933a1
Merge: fa7f05a 53398fd
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Nov 8 20:23:08 2014 -0600

    Merge branch 'master' into f20

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