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

[Rex Dieter]

commit 4d24281d6559569d46bd73736f8db1db57c941da
Merge: ef332c3 d3259a2
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 12:20:02 2014 -0500

    Merge branch 'master' into f20

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