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

[Rex Dieter]

commit ccfe23c1c9e12289ce1be7a2193f46fac70210a1
Merge: 3efda9f f309dbb
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 12:22:24 2014 -0500

    Merge branch 'master' into f20

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