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

[Rex Dieter]

commit 8d0520070b374c85dcc6741bb73e89f96440c42b
Merge: 6e7f6e2 86945ec
Author: Rex Dieter <rdieter at gmail.com>
Date:   Sun Mar 1 17:15:42 2015 -0600

    Merge branch 'master' into f20

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