Merge branch 'gregoa' of colleen:bti into gregoa
authorgregor herrmann <gregoa@debian.org>
Sun, 19 Dec 2010 12:44:56 +0000 (13:44 +0100)
committergregor herrmann <gregoa@debian.org>
Sun, 19 Dec 2010 12:44:56 +0000 (13:44 +0100)
commit43a1175720b5d6991d4d9a9383fa64308f297731
tree009b04b12150548caab89fbdc020d48ac07ee300
parentb22f86cae87b891c2926d6e505300dbbd2f8431f
parentcbe4501f761baa65b22b76887d6efe2957211923
Merge branch 'gregoa' of colleen:bti into gregoa