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

[Rex Dieter]

commit 9b7aa5f16df1cbb14fff242dd23640d2d7bcdeae
Merge: 8bfafd1 fd37d27
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Sep 16 20:36:56 2014 -0500

    Merge branch 'master' into f20

 .gitignore   |    3 +++
 kubrick.spec |   14 +++++++++++++-
 sources      |    2 +-
 3 files changed, 17 insertions(+), 2 deletions(-)
---