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

[Rex Dieter]

commit bbded2bbf8cc3d4d18464511646c892944817e0a
Merge: 6f77f4c 231bc62
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 12:42:56 2014 -0500

    Merge branch 'master' into f20

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