[SCM] ksnapshot packaging branch, kubuntu_wily_backports, updated. ubuntu/4%15.08.2-0ubuntu1-5-g4946953

[Philip Muškovac]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ksnapshot.git;a=commitdiff;h=4946953

The following commit has been merged in the kubuntu_wily_backports branch:
commit 4946953679962b0151acedc50e3f9c3860945bfb
Merge: 270ff8fec954d1addaedb1153fd719dfdb6d78ea 748d9764ad443ec362a691ddef32f60b00699cc3
Author: Philip Muškovac <yofel at gmx.net>
Date:   Mon Jan 11 14:47:56 2016 +0100

    Merge branch 'kubuntu_xenial_archive' into kubuntu_wily_backports
    
    Conflicts:
    	debian/changelog

 debian/changelog | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

-- 
ksnapshot packaging