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

[Rex Dieter]

commit edba01def9cb7c8853139c99952b326681055bd2
Merge: 081fd97 63dd20f
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jan 28 07:04:22 2013 -0600

    Merge branch 'f18' into f17

 okular.spec |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
---