[SCM] cantor packaging branch, master, updated. debian/4.10.5-1

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit de0cd0d7e6aebcc2e7ea95288a880d689dc4eba5
Merge: de5c9660ed6235ae04d6cf09590f08bd747be1ee 3cc0a6a7cd538e1020fc4e972f2b56be0dead288
Author: Maximiliano Curia <maxy at debian.org>
Date:   Mon Jul 1 11:18:44 2013 +0200

    Merge branch 'master' into kde4.10
    
    Conflicts:
    	debian/changelog

-- 
cantor packaging