[Pkg-sugar-commit] [sugar-artwork] 03/04: Merge branch 'master-0.84' of ssh://git.debian.org/git/collab-maint/sugar-artwork into master-0.84

[Jonas Smedegaard]

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

js pushed a commit to annotated tag debian/0.84.1-8
in repository sugar-artwork.

commit c86521cbb643afa531fa15ec299d5bd1d9dc79f9
Merge: b12a760 e963cc6
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Tue Jul 20 15:45:48 2010 +0200

    Merge branch 'master-0.84' of ssh://git.debian.org/git/collab-maint/sugar-artwork into master-0.84
    
    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