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

[Rex Dieter]

commit 5e5b5c22e449cab674e7f095c1e3fbf9bec19738
Merge: 791bf3a 19ced39
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Feb 3 07:30:31 2014 -0600

    Merge branch 'master' into f20

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