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

[Rex Dieter]

commit 343916dc764dbb72a7cc5ab2bd4fa90769ae4a55
Merge: edba01d 810d654
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Thu Mar 7 12:04:08 2013 -0600

    Merge branch 'f18' into f17

 .gitignore                               |    7 +---
 0004-Propertly-encode-the-filename.patch |   27 ---------------
 okular-gcc-overflow.patch                |   12 +++++++
 okular.spec                              |   53 +++++++++++++++++++++++-------
 sources                                  |    2 +-
 5 files changed, 55 insertions(+), 46 deletions(-)
---