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

[Rex Dieter]

commit a95849706bbb9530a4c5145b8e2f21a0eb3a62d4
Merge: 432e3e9 63fb75b
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Sep 16 20:34:10 2014 -0500

    Merge branch 'master' into f20

 .gitignore      |    3 +++
 ksystemlog.spec |   14 +++++++++++++-
 sources         |    2 +-
 3 files changed, 17 insertions(+), 2 deletions(-)
---