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

[Rex Dieter]

commit 572a73a0e8d5364a9961781bef2ff2dc58acd95d
Merge: de78a9c 7d398fb
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jan 20 09:37:31 2015 -0600

    Merge branch 'master' into f20

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