[zathura/f16: 6/6] Merge branch 'master' into f16

[François Cami]

commit 1c6b17dab901747fbe4c8afc9f2edf880e7d32cb
Merge: 26e4b69 5126ec1
Author: François Cami <fcami at fedoraproject.org>
Date:   Wed Nov 28 21:54:44 2012 +0100

    Merge branch 'master' into f16

 .gitignore   |    2 ++
 sources      |    2 +-
 zathura.spec |   54 ++++++++++++++++++++++++++++++++++++++++++------------
 3 files changed, 45 insertions(+), 13 deletions(-)
---