[SCM] okular packaging branch, master, updated. debian/4.12.4-1-2-g05e90e1

Tue Apr 29 13:59:26 UTC 2014

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/okular.git;a=commitdiff;h=05e90e1

The following commit has been merged in the master branch:
commit 05e90e12377ccc2ccafa57ed23edc482d11d3752
Merge: f0dbe4059d684a3ee8b7323dc924ab5b4adbe70a 83f716a503156c45b8de5c700f00dd1d08034854
Author: Maximiliano Curia <maxy at debian.org>
Date:   Tue Apr 29 15:58:06 2014 +0200

    Merge branch 'kde4.12'
    
    Conflicts:
    	debian/changelog

 debian/changelog              | 21 +++++++++++++++++++--
 debian/control                |  5 ++++-
 debian/libokularcore3.symbols |  4 +++-
 debian/okular.install         | 14 ++++++--------
 4 files changed, 32 insertions(+), 12 deletions(-)

-- 
okular packaging