[Pkg-sugar-commit] [sugar-artwork] 02/07: Merge branch 'master-0.86' of ssh://git.debian.org/git/collab-maint/sugar-artwork into master-0.86

[Jonas Smedegaard]

This is an automated email from the git hooks/post-receive script.

js pushed a commit to annotated tag debian/0.86.0-7
in repository sugar-artwork.

commit 91d8852cf6b0c660d16de432bf37c959769d32a7
Merge: c778500 0c83ff5
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Tue Jul 20 15:53:23 2010 +0200

    Merge branch 'master-0.86' of ssh://git.debian.org/git/collab-maint/sugar-artwork into master-0.86
    
    Conflicts (manually resolved):
    	debian/patches/series


-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-sugar/sugar-artwork.git