]> 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: 75adc80 c76d75e)
Merge branch 'upstream'
authorGerfried Fuchs <rhonda@debian.at>
Tue, 18 May 2010 18:05:22 +0000 (20:05 +0200)
committerGerfried Fuchs <rhonda@debian.at>
Tue, 18 May 2010 18:05:22 +0000 (20:05 +0200)

Trivial merge