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

[Rex Dieter]

commit 8bfafd179ab17ea737b9c00cc557a62acacadd81
Merge: a85f3b4 f60cfa2
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 12:48:47 2014 -0500

    Merge branch 'master' into f20

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