Merge branch 'master' of ssh://moonshot.suchdamage.org:822/srv/git/moonshot

Conflicts:
	moonshot/mech_eap/util_saml.cpp

diff --git a/.gitmodules b/.gitmodules
index cda0ebd..8eb03cc 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -28,3 +28,6 @@
 [submodule "jansson"]
        path = jansson
        url = git://github.com/akheron/jansson.git
+[submodule "firefox"]
+       path = firefox
+       url = http://www.project-moonshot.org/git/moonshot-firefox.git

diff --git a/admin/pull_foreign_repos b/admin/pull_foreign_repos
index a3a41b2..aff6363 100755 (executable)
--- a/admin/pull_foreign_repos
+++ b/admin/pull_foreign_repos
@@ -9,3 +9,5 @@ cd $module_root/shibboleth
 for rep in *.git; do
     (cd $rep&&git svn fetch)
     done
+cd $module_root/radsecproxy.git
+git fetch origin

diff --git a/firefox b/firefox
new file mode 160000 (submodule)
index 0000000..3dd30c1
--- /dev/null
+++ b/firefox
@@ -0,0 +1 @@
+Subproject commit 3dd30c1cb60608e936d6734b29eb9c01a67cbac6