Merge branch 'master' into gregoa
authorgregor herrmann <gregoa@debian.org>
Sat, 8 Oct 2011 19:31:25 +0000 (21:31 +0200)
committergregor herrmann <gregoa@debian.org>
Sat, 8 Oct 2011 19:31:25 +0000 (21:31 +0200)
commit714fdede2ae49c1c02576cfb99f8ed636512b362
treea223e8d8826e3e49c52063dedc3b6a89fcc4e169
parent6f3c31e6776a8a3669ebe53d882c07343c4e43ac
parent0c658fa07c706200da979d0b0131cb1250010ce2
Merge branch 'master' into gregoa