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

[Rex Dieter]

commit 71324483d03184a32144c41920193358857d8020
Merge: 22efb4c e809be3
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 12:20:17 2014 -0500

    Merge branch 'master' into f20

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