Merge branch 'upstream' into debian
authorRuss Allbery <rra@debian.org>
Fri, 21 Aug 2009 17:39:49 +0000 (10:39 -0700)
committerRuss Allbery <rra@debian.org>
Fri, 21 Aug 2009 17:39:49 +0000 (10:39 -0700)
commitc772ba2fd7216ea7ed42a38c6487f4a71525903b
tree0364c923a3649b1e794bf8b751c3478fe742a4ee
parenteee9a9708e44421598eb6b0aff7ea334a46e801f
parenta5b1914f888d2ac8992cc4985d65e9d727aa8df4
Merge branch 'upstream' into debian

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