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

[Rex Dieter]

commit b26d3c7b3d06690abec711f86d7351bf1d9c76b5
Merge: 4f06d78 3dac80f
Author: Rex Dieter <rdieter at gmail.com>
Date:   Sun Mar 1 17:18:09 2015 -0600

    Merge branch 'master' into f20

 .gitignore     | 2 ++
 kollision.spec | 8 +++++++-
 sources        | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)
---