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

[Rex Dieter]

commit 4c5613598f7f99c84e22a1ff9d6d0197265d7bab
Merge: b530088 c1e64c8
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Nov 8 17:31:46 2014 -0600

    Merge branch 'master' into f20

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