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

[Rex Dieter]

commit 3efda9fad75cba22bed03c1be9b93a7d5e901fd0
Merge: 0777ea0 5a4bc28
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 22:38:54 2014 -0500

    Merge branch 'master' into f20

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