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

[Rex Dieter]

commit 97b835d18374c3109bafe42fba2a8a9fb9eab180
Merge: 151098c 8c27fc1
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jan 20 10:41:40 2015 -0600

    Merge branch 'master' into f20

 .gitignore      |   23 +----------------------
 ksystemlog.spec |   24 ++++++++++++++++++------
 sources         |    2 +-
 3 files changed, 20 insertions(+), 29 deletions(-)
---