Merge branch 'upstream' into debian
authorRuss Allbery <rra@debian.org>
Tue, 10 Nov 2009 23:06:21 +0000 (15:06 -0800)
committerRuss Allbery <rra@debian.org>
Tue, 10 Nov 2009 23:06:21 +0000 (15:06 -0800)
commitadcb97428d45b0782af2d88552c78ce86fc17d30
tree607e8745f7b2a8a32b2db51c364718b13f71fe19
parenteea70e5dabf844008e065b7eed802ed0859d7540
parent2b8daf0f4fd3e5035ab3babdc76fe676e8823f93
Merge branch 'upstream' into debian

Conflicts:
shibsp/paths.h
configs/Makefile.am
configs/Makefile.in
configs/keygen.sh
configs/shibd-debian.in
schemas/Makefile.am
shibsp/paths.h