]> git.deb.at Git - pkg/t-prot.git/commit
Merge branch 'master' of git.deb.at:pkg/t-prot
authorAxel Beckert <abe@deuxchevaux.org>
Sun, 26 Apr 2015 02:51:49 +0000 (04:51 +0200)
committerAxel Beckert <abe@deuxchevaux.org>
Sun, 26 Apr 2015 02:51:49 +0000 (04:51 +0200)
commit3d76d3fe8f1ede365de7e60b0e1d97e7c284ec3c
tree410f94ed25cc02f90527154701a62f4b1a74659c
parentf696f652b0a9b4bcae2a289f1d8cbb0c5fc8542b
parent3cb4ee97197728cc569da259357eeaa7ed325974
Merge branch 'master' of git.deb.at:pkg/t-prot

Conflicts:
debian/changelog
debian/changelog