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

[Rex Dieter]

commit e69de625c1c3feae67a2687920cbe82de1bc523e
Merge: 65a390f 2a37d61
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 17:17:43 2014 -0500

    Merge branch 'master' into f20

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