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

[Rex Dieter]

commit 978d8709c66f93f8df725da559e51167c626d4dc
Merge: ba2a4e0 1eca909
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 12:33:54 2014 -0500

    Merge branch 'master' into f20

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