Merge branch 'master' into gregoa
authorgregor herrmann <gregoa@debian.org>
Sat, 25 Sep 2010 11:37:00 +0000 (13:37 +0200)
committergregor herrmann <gregoa@debian.org>
Sat, 25 Sep 2010 11:37:00 +0000 (13:37 +0200)
commitc2fa9e7b34837cc75761ca04a33080dec967c9c7
tree2357616517e41609253e7b4c58e7f532fdb5fcde
parenta757d6e46b25be5ce960bac9275b48959718665c
parent7f3eec8282036f9f606ff48fc221062b6c06e9b1
Merge branch 'master' into gregoa