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

[Rex Dieter]

commit c8e2ccfdd0bad4665a74c08f5c742507903f6696
Merge: a27b01f 06f0d81
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 12:39:34 2014 -0500

    Merge branch 'master' into f20

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