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

[Rex Dieter]

commit ba2a4e0a88e93427fb4856772af7b74893609dc1
Merge: f5b8b6b 7d7739d
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 22:56:42 2014 -0500

    Merge branch 'master' into f20

 .gitignore    |    6 ++++++
 kdiamond.spec |   23 ++++++++++++++++++++++-
 sources       |    2 +-
 3 files changed, 29 insertions(+), 2 deletions(-)
---