[zathura/f15/master: 2/2] Merge branch 'master' into f15

[Christoph Wickert]

commit 831f73317155c4e27ddf53d70557d4af85db10b9
Merge: 5a3805b dbbd874
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date:   Sat Apr 2 03:23:42 2011 +0200

    Merge branch 'master' into f15

 zathura.spec |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)
---