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

[Rex Dieter]

commit 106b4094afcccfa748868a021a995998b6ff9b1e
Merge: ede2d6a 7a0c393
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Nov 8 20:25:16 2014 -0600

    Merge branch 'master' into f20

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