[kpat/f20: 6/6] Merge branch 'master' into f20

[Rex Dieter]

commit f35677d0f61fb7ad9e596891a6368c0788c026a3
Merge: b94fcdd 76800cc
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Sep 16 20:27:54 2014 -0500

    Merge branch 'master' into f20

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