summaryrefslogtreecommitdiff
path: root/README
diff options
context:
space:
mode:
authorTill Kamppeter <till.kamppeter@gmail.com>2010-08-10 19:19:58 +0200
committerTill Kamppeter <till.kamppeter@gmail.com>2010-08-10 19:19:58 +0200
commitb59cfc28fd897a9c73fe87fc2ed15aaed4e287cf (patch)
tree8169cdbb21f081ed6e22aeef4370632b7f5af61a /README
parentf14f89b26611aa52c15665850e882a7d0b0d6232 (diff)
parent780a60f910f85ed2860408813091c798f702325e (diff)
Merge branch 'master' of git+ssh://git.debian.org/git/collab-maint/foomatic-filtersubuntu/4.0.5-0ubuntu2
Conflicts: debian/changelog
Diffstat (limited to 'README')
0 files changed, 0 insertions, 0 deletions