From: Sam Hartman <hartmans@debian.org>
Date: Tue, 26 Apr 2011 20:53:34 +0000 (-0400)
Subject: Merge branch 'master' into debian
X-Git-Tag: dvd/201105~35
X-Git-Url: http://www.project-moonshot.org/gitweb/?a=commitdiff_plain;h=da4e2fa65e9a3017b695a00d55f00a6c5392b225;hp=-c;p=moonshot.git

Merge branch 'master' into debian

Conflicts:
	libeap
---

da4e2fa65e9a3017b695a00d55f00a6c5392b225
diff --combined .gitmodules
index 7f32183,cda0ebd..fabbb79
--- a/.gitmodules
+++ b/.gitmodules
@@@ -3,7 -3,7 +3,7 @@@
  	url = http://www.project-moonshot.org/git/mod_auth_kerb.git
  [submodule "radsecproxy"]
  	path = libradsec
 -	url = git://git.nordu.net/radsecproxy.git
 +	url = http://www.project-moonshot.org/git/radsecproxy.git
  [submodule "shibboleth/opensaml2"]
  	path = shibboleth/opensaml2
  	url = http://www.project-moonshot.org/git/shibboleth/opensaml2.git
@@@ -20,7 -20,7 +20,7 @@@
  	path = shibboleth/resolver
  	url = http://www.project-moonshot.org/git/shibboleth/resolver.git
  [submodule "libeap"]
- 	path = libeap
+ 	path = moonshot/libeap
  	url = http://www.project-moonshot.org/git/libeap.git
  [submodule "openssh"]
  	path = openssh