]> 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: 46d333b 4e3c7e7)
Merge branch 'upstream' of git.deb.at:pkg/t-prot into upstream upstream
authorAxel Beckert <abe@deuxchevaux.org>
Sun, 26 Apr 2015 02:47:28 +0000 (04:47 +0200)
committerAxel Beckert <abe@deuxchevaux.org>
Sun, 26 Apr 2015 02:47:28 +0000 (04:47 +0200)

Trivial merge