[zathura/epel7: 4/4] Merge branch 'master' into epel7

[François Cami]

commit 0e1624403c5b74f7fbf25e49291853387334269d
Merge: 4adfbee 922aba8
Author: François Cami <fcami at fedoraproject.org>
Date:   Fri Mar 7 17:11:01 2014 +0100

    Merge branch 'master' into epel7

 .gitignore   |    2 ++
 sources      |    2 +-
 zathura.spec |   16 +++++++++++++---
 3 files changed, 16 insertions(+), 4 deletions(-)
---