[kmag/f17: 8/8] Merge branch 'f18' into f17

[Rex Dieter]

commit 239a271de6440dc1b9205d77a448dcfb231f59d3
Merge: c1be416 8714a8e
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Fri Mar 8 09:51:49 2013 -0600

    Merge branch 'f18' into f17

 .gitignore |    7 +------
 kmag.spec  |   21 ++++++++++++++++++---
 sources    |    2 +-
 3 files changed, 20 insertions(+), 10 deletions(-)
---