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

[Rex Dieter]

commit 6d1f31a73bb0ecd2b1e8f24f8abbe210fa0e7953
Merge: 461ceb5 b0d0fa2
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 22:44:03 2014 -0500

    Merge branch 'master' into f20

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