[SCM] ktouch packaging branch, master, updated. debian/4.12.4-1-2-g81df3fc

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/ktouch.git;a=commitdiff;h=81df3fc

The following commit has been merged in the master branch:
commit 81df3fcf5796ca385c1b56247658afb68b567e2d
Merge: 80177eb5d145f7e3b6913b88e5cb3ad78f9b0ed9 8907b94f908ec8a4cb50db8525a1a3faec216ee2
Author: Maximiliano Curia <maxy at debian.org>
Date:   Tue Apr 29 16:13:41 2014 +0200

    Merge branch 'master' of git://git.debian.org/pkg-kde/kde-sc/ktouch
    
    Conflicts:
    	debian/changelog

-- 
ktouch packaging