Merge branch 'master' into nohook
authorPierre Habouzit <madcoder@debian.org>
Tue, 20 Nov 2007 23:30:22 +0000 (00:30 +0100)
committerPierre Habouzit <madcoder@debian.org>
Tue, 20 Nov 2007 23:30:22 +0000 (00:30 +0100)
commit07066d3ea19865d08c4a8fd98b5e87eeace810da
tree2ef03d18c103a475f60e732d4c80f36a25774dc0
parent2c0e197ef42e4cdff1eff705c8b1b1d07336bf24
parent108e0b3c153adc852b07725cbe547f51ae08f436
Merge branch 'master' into nohook