[sword/epel7: 6/6] Merge branch 'master' into epel7

[Matej Cepl]

commit b00b784faf7d90c100f02b7a248147a27e3250c4
Merge: 67e63a8 ae43250
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Mon Nov 3 12:03:13 2014 +0100

    Merge branch 'master' into epel7

 sword.spec |   23 ++++++++++++++++++-----
 1 files changed, 18 insertions(+), 5 deletions(-)
---
diff --cc sword.spec
index 22a734d,e5ce810..389fe7b
--- a/sword.spec
+++ b/sword.spec
@@@ -1,6 -1,6 +1,6 @@@
 -Name:           sword           
 +Name:           sword
  Version:        1.7.3
- Release:        3%{?dist}
+ Release:        9%{?dist}
  Summary:        Free Bible Software Project
  License:        GPLv2
  URL:            http://www.crosswire.org/sword/