[okular/f17: 3/3] Merge branch 'f18' into f17

[Rex Dieter]

commit 38ee633f1bb55eb0415257fecbb96604ad88caee
Merge: 18bf170 3183602
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Nov 6 14:51:38 2012 -0600

    Merge branch 'f18' into f17

 .gitignore  |    1 +
 okular.spec |    8 +++++++-
 sources     |    2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)
---