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)
commit822e5af92df2888f13647dac74ad50b0fcc5c1e4
treeea180d568c0b5dbe2c278bb4e44eac988ebf3623
parent39023c865046f5230b94d07201855d1c2033b781
parent2b8daf0f4fd3e5035ab3babdc76fe676e8823f93
Merge branch 'upstream' into bug/init
configs/shibd-debian.in