[SCM] kdiamond packaging branch, master, updated. debian/4.12.4-1-2-gd00dc47

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit d00dc475ce4f30235b76d68db6725cba31b1f673
Merge: a240560c576f4779651d7e9ab8642a9ae186757d faabc726c2481b519e7da80b0beeb3ab00c542fe
Author: Maximiliano Curia <maxy at debian.org>
Date:   Tue Apr 29 15:57:16 2014 +0200

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

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

-- 
kdiamond packaging