[bomber/f20: 10/10] Merge branch 'master' into f20

[Rex Dieter]

commit ef332c3b15857ca95ec4a4a61c0457b636a621f3
Merge: adaa146 b7230a9
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 22:35:23 2014 -0500

    Merge branch 'master' into f20

 .gitignore  |    6 ++++++
 bomber.spec |   23 ++++++++++++++++++++++-
 sources     |    2 +-
 3 files changed, 29 insertions(+), 2 deletions(-)
---