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

[Rex Dieter]

commit 8fa74065a4d69bf59e476f1823cc4115b9a5f956
Merge: 4e43708 24a2118
Author: Rex Dieter <rdieter at gmail.com>
Date:   Sun Mar 1 17:18:00 2015 -0600

    Merge branch 'master' into f20

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