Merge branch 'gregoa' of colleen:bti into gregoa
authorgregor herrmann <gregoa@debian.org>
Sun, 16 Jan 2011 14:04:55 +0000 (15:04 +0100)
committergregor herrmann <gregoa@debian.org>
Sun, 16 Jan 2011 14:04:55 +0000 (15:04 +0100)
commit54d55d675672cd798df82bbb02043218d3e3d129
treee7656f73682ce8fc9bdc5671fad8e7e6933b64f5
parent3dba67d402e212ac08d2e0821f78a57b6fc2ae66
parent265cb514ec1ec84872929a9182c9091b73009272
Merge branch 'gregoa' of colleen:bti into gregoa