Merge branch 'master' into gregoa
authorgregor herrmann <gregoa@debian.org>
Sat, 8 Oct 2011 01:36:39 +0000 (03:36 +0200)
committergregor herrmann <gregoa@debian.org>
Sat, 8 Oct 2011 01:36:39 +0000 (03:36 +0200)
commit6f3c31e6776a8a3669ebe53d882c07343c4e43ac
treea223e8d8826e3e49c52063dedc3b6a89fcc4e169
parent33c818fb2f8b68da45e0bb177d615e99cbbcf707
parent1d0be81ac31542fede855d5014eaf3af107db090
Merge branch 'master' into gregoa