Merge branch 'gregoa' of colleen:bti into gregoa
authorgregor herrmann <gregoa@debian.org>
Sun, 2 Jan 2011 15:40:02 +0000 (16:40 +0100)
committergregor herrmann <gregoa@debian.org>
Sun, 2 Jan 2011 15:40:02 +0000 (16:40 +0100)
commit3dba67d402e212ac08d2e0821f78a57b6fc2ae66
tree27afe6eb3e3e459cc2eaee673908fbc2e4fcb50b
parent43a1175720b5d6991d4d9a9383fa64308f297731
parenta2a9b063ba94efbaa4a70e2d9a0e2ffd4d3c5531
Merge branch 'gregoa' of colleen:bti into gregoa