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

[Rex Dieter]

commit 0c778e04c2934a97853fcb766234cba12e8813c6
Merge: dbe76c1 017ba24
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Sep 16 20:01:04 2014 -0500

    Merge branch 'master' into f20

 .gitignore |    3 +++
 jovie.spec |   14 +++++++++++++-
 sources    |    2 +-
 3 files changed, 17 insertions(+), 2 deletions(-)
---