[kppp/f20: 10/10] Merge branch 'master' into f20

[Rex Dieter]

commit 6f77f4c98f66fb3eb82e8c8418462d2a4234cf7c
Merge: 55e913a d30a52f
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 23:10:20 2014 -0500

    Merge branch 'master' into f20

 .gitignore |    6 ++++++
 kppp.spec  |   23 ++++++++++++++++++++++-
 sources    |    2 +-
 3 files changed, 29 insertions(+), 2 deletions(-)
---