diff options
author | Dan McGee <dan@archlinux.org> | 2009-01-04 11:12:28 -0600 |
---|---|---|
committer | Dan McGee <dan@archlinux.org> | 2009-01-04 11:12:28 -0600 |
commit | 6f9539aefb13e640f97a72121de13b749846f648 (patch) | |
tree | 0a911c89656de9929deb6bcf318d0cef1d887b3a /etc/.gitignore | |
parent | a30bf868ca4cce5464f7e4aa55cd7e7d4eade9a2 (diff) | |
parent | 997a611fa442c5b8f096746fd21b954864b0af44 (diff) |
Merge branch 'maint'
Conflicts:
po/it.po
Diffstat (limited to 'etc/.gitignore')
0 files changed, 0 insertions, 0 deletions