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

[Rex Dieter]

commit e39d647d24b9a369e946fe2880ea16322a3b6099
Merge: 106b409 826a497
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jan 20 10:44:12 2015 -0600

    Merge branch 'master' into f20

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