[Pkg-sugar-commit] [sugar-toolkit-gtk3] 05/05: Merge branch 'master' of git.debian.org:/git/pkg-sugar/sugar-toolkit-gtk3

[Jonas Smedegaard]

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

js pushed a commit to branch master
in repository sugar-toolkit-gtk3.

commit e96ecfd9ed87e9c4997f7a937761b08bacb11a2b
Merge: ead9708 850a769
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sun Jun 14 15:46:23 2015 -0500

    Merge branch 'master' of git.debian.org:/git/pkg-sugar/sugar-toolkit-gtk3
    
    Conflicts (resolved manually):
    	debian/changelog


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