Merge remote-tracking branch 'origin/moonshot-packaging-fixes' into HEAD
authorSam Hartman <hartmans@painless-security.com>
Sat, 3 Nov 2012 09:34:40 +0000 (05:34 -0400)
committerSam Hartman <hartmans@painless-security.com>
Sat, 3 Nov 2012 09:34:40 +0000 (05:34 -0400)
commit997a4736b6fe81066e13822d3163de3a20cd6353
tree7fd0e7e67d804b028838783ce63b03057c5c0d93
parentd98a71ccae3e120443eae38ce73ef68404d0c9c2
parenta88b3c840ca70bbaa1dc828790e36b394e3dfba9
Merge remote-tracking branch 'origin/moonshot-packaging-fixes' into HEAD

Conflicts:
configs/Makefile.am
msi/scripts/shib_uninstall_isapi_filter.vbs
shibd/Makefile.am
configs/Makefile.am