Merge branch 'debian'
authorRuss Allbery <rra@debian.org>
Tue, 10 Nov 2009 23:45:09 +0000 (15:45 -0800)
committerRuss Allbery <rra@debian.org>
Tue, 10 Nov 2009 23:45:09 +0000 (15:45 -0800)
commit03362422ca718405bc6ea12df57c74ae63010b50
tree0b18dd1416524a4c6e700d50ec814d4b79b9bddf
parent317bfa4284332407ec6ae78211854441c6699c40
parent86b8a8edb8cded41e67f4e544133dfea11942d9f
Merge branch 'debian'

Conflicts:
configs/shibd-debian.in
configs/shibd-debian.in