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

[Rex Dieter]

commit d52a0229c5ef3c61bc8a681240f29d7a596a4f45
Merge: 798c311 095e5ee
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Feb 3 08:53:06 2014 -0600

    Merge branch 'master' into f20

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