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

[Rex Dieter]

commit dbe76c124878911841a264bf834f1ee3ab6a8424
Merge: 9f78c30 b629ab6
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 12:22:10 2014 -0500

    Merge branch 'master' into f20

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