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

[Rex Dieter]

commit a85f3b493582b8397a8ed125e6e7feb571286b29
Merge: 6d01620 0750663
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 23:19:07 2014 -0500

    Merge branch 'master' into f20

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