Merge branch '_nb' into allinone-nb

Conflicts (sync submodules basewiki, basewiki_nonedit and templates_nonedit with HEAD of *_nb branch):
	basewiki

4 files changed, 0 insertions, 0 deletions

diff --git a/basewiki_nonedit b/basewiki_nonedit
-Subproject 7fb1c12eb8ab54df0085bac0262ba73d5a85819
+Subproject 240f2f0aeec158e94b54ca23a2cf3e19b95e5ea
diff --git a/javascript b/javascript
-Subproject dea1eff3d9e9781e5b92a326ad7df17d3ba8ba1
+Subproject 9bf18ddbcb122e0f0005c06870c3b792bf7d9b0
diff --git a/openid-selector b/openid-selector
-Subproject b4852ae1f1905a285d69947d6352b6898303324
+Subproject 517a71e93b14812d722f000ab42a6e61cb7b402
diff --git a/templates_nonedit b/templates_nonedit
-Subproject 5967d73895eaf2410c48b886e3cf2778f678fd6
+Subproject 8c0c142ad073666eaa626ea6bebcc76138e351f