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

[Rex Dieter]

commit 22efb4c281dfe80954b77df7af7e2a0dfad95e3b
Merge: 4326a6d 2123151
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 22:35:45 2014 -0500

    Merge branch 'master' into f20

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