[SCM] kgpg packaging branch, master, updated. debian/4.12.4-1-2-g2275f58

Tue Apr 29 13:48:23 UTC 2014

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kgpg.git;a=commitdiff;h=2275f58

The following commit has been merged in the master branch:
commit 2275f587d5ad5f553a0f980b6067cd76d1d08f33
Merge: bfaecd9153e483910bb6cc88ab8d93c7859ccd8b da8877b0f15428ae0ff1146c18c0867051ba5816
Author: Maximiliano Curia <maxy at debian.org>
Date:   Tue Apr 29 15:47:57 2014 +0200

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

 debian/changelog | 18 ++++++++++++++++--
 debian/control   | 14 +++++++++-----
 debian/copyright |  3 +--
 3 files changed, 26 insertions(+), 9 deletions(-)

-- 
kgpg packaging