Merge branch 'upstream' into bug/init
authorRuss Allbery <rra@debian.org>
Tue, 10 Nov 2009 23:03:48 +0000 (15:03 -0800)
committerRuss Allbery <rra@debian.org>
Tue, 10 Nov 2009 23:03:48 +0000 (15:03 -0800)
1  2 
configs/shibd-debian.in

Simple merge