Merge branch 'master' of ssh://git.samba.org/data/git/jelmer/bts-link
authorJelmer Vernooij <jelmer@samba.org>
Fri, 20 Jun 2008 11:07:32 +0000 (13:07 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Fri, 20 Jun 2008 11:07:32 +0000 (13:07 +0200)
commit61a7851e2c7ded74c9933e7d45595b573a18b6ae
tree1b2e21dbae21b82178588159cd09b1350d7788af
parent055fc2ab9507705a482773b406fcebb83d629d67
parente546c7720dca2de0ed0319f3bcb15167375b1b62
Merge branch 'master' of ssh://git.samba.org/data/git/jelmer/bts-link