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

[Rex Dieter]

commit 81532dee9a421b8ed9ac9b77f7be1e6419afd76d
Merge: ab32800 fd5099b
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Feb 3 11:55:00 2014 -0600

    Merge branch 'master' into f20

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