[qyoto/f20: 5/5] Merge branch 'f21' into f20

[Rex Dieter]

commit 626c66fa7edb235de29d91f9a574c04b68ad7f05
Merge: 7e84b5e 2494cb0
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Sep 16 15:57:24 2014 -0500

    Merge branch 'f21' into f20

 .gitignore |    3 +++
 qyoto.spec |   14 +++++++++++++-
 sources    |    2 +-
 3 files changed, 17 insertions(+), 2 deletions(-)
---