[jovie/f17: 2/2] Merge branch 'f18' into f17

[Rex Dieter]

commit 82b8c2d288cccc7910a1409a904c8cd5efebde9f
Merge: 72993e9 c46a36c
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Dec 29 06:42:54 2012 -0600

    Merge branch 'f18' into f17

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