[Pkg-fonts-devel] [pkg-fonts] 02/02: Resolve conflict

[Christian Perrier]

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

bubulle pushed a commit to branch master
in repository pkg-fonts.

commit afe8512a32804498729e4252bd13aed7d15bfd52
Merge: cfd11de e722096
Author: Christian Perrier <bubulle at debian.org>
Date:   Fri Nov 1 19:19:07 2013 +0100

    Resolve conflict


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