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

[Rex Dieter]

commit 6535e5fd0fce935b0b8ff39a77e19ff07a1e0905
Merge: dc00df8 27c18a0
Author: Rex Dieter <rdieter at gmail.com>
Date:   Sun Mar 1 17:16:03 2015 -0600

    Merge branch 'master' into f20

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