[qyoto/f20: 10/10] Merge branch 'master' into f20

[Rex Dieter]

commit 41891bdff9a9e98f0ac74217531d97a47a136dde
Merge: 987d53d 1a9713f
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sun Feb 2 15:57:11 2014 -0600

    Merge branch 'master' into f20

 .gitignore |   16 ++++++----------
 qyoto.spec |   23 ++++++++++++++++++++++-
 sources    |    2 +-
 3 files changed, 29 insertions(+), 12 deletions(-)
---