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

[Rex Dieter]

commit b5ac5cf259b141439ecffadf29eb929a40178b19
Merge: cddef71 908f45c
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Dec 29 06:45:47 2012 -0600

    Merge branch 'f18' into f17

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