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

[Rex Dieter]

commit e219d852e52c402f3b6aa7cb09a63b5a8e3dcc46
Merge: ccfe23c 5c71100
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Sep 16 20:01:28 2014 -0500

    Merge branch 'master' into f20

 .gitignore |   32 ++------------------------------
 juk.spec   |   28 ++++++++++++++++++++++++++--
 sources    |    2 +-
 3 files changed, 29 insertions(+), 33 deletions(-)
---