[kdiamond/f19: 7/7] Merge branch 'master' into f19

[Rex Dieter]

commit ce087e8e1a0bba32f55cac5d8149769effabecb4
Merge: fe7ad76 25bd727
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Thu Sep 5 13:24:59 2013 -0500

    Merge branch 'master' into f19

 .gitignore    |    5 +++++
 kdiamond.spec |   17 ++++++++++++++++-
 sources       |    2 +-
 3 files changed, 22 insertions(+), 2 deletions(-)
---