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

[Rex Dieter]

commit 772d1a5afd6069784f6291d94785af693fce200c
Merge: 7d7a43a 0353c6e
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Feb 3 11:01:03 2014 -0600

    Merge branch 'master' into f20

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