[Pkg-cli-apps-commits] [SCM] docky branch, master, updated. debian/2.0.3.1-1-6-gc51ac71

[Iain Lane]

The following commit has been merged in the master branch:
commit c51ac71c9a7e420dae46661b7bf3118a4a6b2eee
Merge: d186bbdbeb81131f370a4f68a3e377b452bd947d 6bfe75b382cb8b6df4b96c443eda3b5fd03c9c96
Author: Iain Lane <laney at ubuntu.com>
Date:   Sat May 15 12:41:04 2010 +0100

    Merge branch 'master' of git+ssh://git.debian.org/git/pkg-cli-apps/packages/docky
    
    Conflicts:
    	debian/changelog


-- 
docky