diff options
| author | Didier Raboud <didier@raboud.com> | 2010-05-23 00:07:10 +0200 |
|---|---|---|
| committer | Didier Raboud <didier@raboud.com> | 2010-05-23 00:07:10 +0200 |
| commit | f56211f0ff4ddf9371ebc4c31e8f95df1fc81a5c (patch) | |
| tree | a24f15ea2fc96e0688e96c58e35dde7adeaef3fb /debian/po/es.po | |
| parent | b834bd56528993fa05a5645da808227aee3e9de7 (diff) | |
| parent | 014f0e14a3c6a044d99a67c8f4e1c4065452479e (diff) | |
Merge branch 'upstream'
Conflicts:
debian/README.Debian
debian/changelog
debian/control
debian/copyright
debian/foomatic-filters.config
debian/foomatic-filters.postinst
debian/foomatic-filters.postrm
debian/foomatic-filters.templates
debian/parseconfig.pl
debian/po/de.po
debian/po/fr.po
debian/po/ja.po
debian/po/nl.po
debian/po/pt_BR.po
debian/po/templates.pot
debian/po/tr.po
debian/rules
Diffstat (limited to 'debian/po/es.po')
0 files changed, 0 insertions, 0 deletions