]> git.deb.at Git - pkg/t-prot.git/commitdiff
projects / pkg / t-prot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e8db415 ec2a805)
Merge branch 'upstream'
authorGerfried Fuchs <rhonda@debian.at>
Wed, 17 Feb 2010 19:26:43 +0000 (20:26 +0100)
committerGerfried Fuchs <rhonda@debian.at>
Wed, 17 Feb 2010 19:26:43 +0000 (20:26 +0100)

Trivial merge