Merge branch 'master' into gregoa
authorgregor herrmann <gregoa@debian.org>
Fri, 4 Nov 2011 19:46:33 +0000 (20:46 +0100)
committergregor herrmann <gregoa@debian.org>
Fri, 4 Nov 2011 19:46:33 +0000 (20:46 +0100)
commit49444d16c5c1a9faa75a715214e2436010daa7e6
treee3fd087ceb57283878699183fd28f4f7c10ca39d
parent62218d9b082bf37952ee4aecd37a6cee48943f63
parent9b88bdb4ba1345728b0e27cdd40e6c861f76679c
Merge branch 'master' into gregoa
bti.xml