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

[Than Ngo]

commit f6598e7228819d9c18b2e79cb365c19710fcaa30
Merge: 4b46fee 7c5f958
Author: Than Ngo <than at redhat.com>
Date:   Thu Dec 6 15:45:54 2012 +0100

    Merge branch 'f18' into f17

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