[okular/f19: 9/9] Merge branch 'master' into f19

[Rex Dieter]

commit c4583da937bddaac2063067e6445e6ca4a128f7b
Merge: bfe9f97 83dae23
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Thu Sep 5 08:21:01 2013 -0500

    Merge branch 'master' into f19

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