Merge branch 'gregoa' of colleen:bti into gregoa
authorgregor herrmann <gregoa@debian.org>
Sat, 19 Mar 2011 13:01:44 +0000 (14:01 +0100)
committergregor herrmann <gregoa@debian.org>
Sat, 19 Mar 2011 13:01:44 +0000 (14:01 +0100)
commitf8ec64472ec690ea5f67c8fec7ad260a962c95a5
tree437730c883bd8e6d47e60bb0991753b113ba6575
parent54d55d675672cd798df82bbb02043218d3e3d129
parent14efb05b582519de79bf9b0f6fe9dedfa6cc168e
Merge branch 'gregoa' of colleen:bti into gregoa