[okular/f20: 15/15] Merge branch 'master' into f20

[Rex Dieter]

commit 12f6f186e2ed3240138a051fc4826f506053f2f3
Merge: 9e712b3 c832f0a
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sun Feb 2 16:30:51 2014 -0600

    Merge branch 'master' into f20

 .gitignore  |    6 +++++
 okular.spec |   60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 sources     |    2 +-
 3 files changed, 64 insertions(+), 4 deletions(-)
---