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

[Rex Dieter]

commit 8d15831a135d03aeac8974ab86924947a3f80d74
Merge: d8c2b03 2c7ba4d
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 12:25:14 2014 -0500

    Merge branch 'master' into f20

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