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

[Rex Dieter]

commit b94fcdd2e0f8d811e8fbff0d7194db18d014591f
Merge: c3bb4a8 f37983b
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 12:42:42 2014 -0500

    Merge branch 'master' into f20

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