Merge branch 'master' into debian

Conflicts:
	libeap

diff --combined .gitmodules
index 7f32183,cda0ebd..fabbb79
--- 1/.gitmodules
--- 2/.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