Merge branch 'master' of ssh://spaillar-guest@git.debian.org/git/webwml/packages
authorSimon Paillard <simon.paillard@resel.enst-bretagne.fr>
Fri, 29 Feb 2008 09:53:39 +0000 (10:53 +0100)
committerSimon Paillard <simon.paillard@resel.enst-bretagne.fr>
Fri, 29 Feb 2008 09:53:39 +0000 (10:53 +0100)
commit4fec9449ddf3d2a6162c05387367746f3e17e329
tree27fe52da908ebd41fa0b58c1af9d6c5008e52c9a
parent89b7e4f99e2adc07f7cbaf6fadb67d75842224d2
parente857c7faf655933b3e6395312e46fe8a52591449
Merge branch 'master' of ssh://spaillar-guest@git.debian.org/git/webwml/packages

Conflicts:

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