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

[Rex Dieter]

commit 9f78c30a7ebe99fd4e11bf9a2a39e3a8a247e0ac
Merge: 074774d 18975c9
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 22:38:32 2014 -0500

    Merge branch 'master' into f20

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