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

[Rex Dieter]

commit d99717a5235b3b34fe25bd71ad5201b81ef902d4
Merge: 82bae7c 2cbe357
Author: Rex Dieter <rdieter at gmail.com>
Date:   Sun Mar 1 17:14:01 2015 -0600

    Merge branch 'master' into f20

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