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

[Rex Dieter]

commit b166e72fb0c9233cb73be349fd72215519c0d482
Merge: b212fb9 eefd1b6
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Fri Dec 28 21:11:12 2012 -0600

    Merge branch 'f18' into f17

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