From: Simon Paillard <simon.paillard@resel.enst-bretagne.fr>
Date: Fri, 29 Feb 2008 09:53:39 +0000 (+0100)
Subject: Merge branch 'master' of ssh://spaillar-guest@git.debian.org/git/webwml/packages
X-Git-Url: https://git.deb.at/?p=deb%2Fpackages.git;a=commitdiff_plain;h=4fec9449ddf3d2a6162c05387367746f3e17e329;hp=4fec9449ddf3d2a6162c05387367746f3e17e329

Merge branch 'master' of ssh://spaillar-guest@git.debian.org/git/webwml/packages

Conflicts:

	po/pdo.fr.po
	po/templates.fr.po
---