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

[Rex Dieter]

commit 432e3e967c4bde7d66caa8d5f79244f72fee91bc
Merge: d26ad91 b0b0677
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 12:46:53 2014 -0500

    Merge branch 'master' into f20

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